diff options
Diffstat (limited to 'cpp/test')
88 files changed, 0 insertions, 208 deletions
diff --git a/cpp/test/Glacier2/application/Client.cpp b/cpp/test/Glacier2/application/Client.cpp index bc6fb814f5f..eb7531996bd 100644 --- a/cpp/test/Glacier2/application/Client.cpp +++ b/cpp/test/Glacier2/application/Client.cpp @@ -103,7 +103,6 @@ public: _destroyed = true; } - int _restart; bool _destroyed; CallbackReceiverIPtr _receiver; @@ -111,7 +110,6 @@ public: } // anonymous namespace end - int main(int argc, char* argv[]) { diff --git a/cpp/test/Glacier2/dynamicFiltering/SessionI.h b/cpp/test/Glacier2/dynamicFiltering/SessionI.h index a18e38bef5d..5ba0f048169 100644 --- a/cpp/test/Glacier2/dynamicFiltering/SessionI.h +++ b/cpp/test/Glacier2/dynamicFiltering/SessionI.h @@ -33,7 +33,6 @@ private: TestControllerIPtr _controller; }; - class SessionI : public Test::TestSession { public: diff --git a/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp b/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp index 29eecdf4d8d..6a656996038 100644 --- a/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp +++ b/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp @@ -73,7 +73,6 @@ TestControllerI::step(const Glacier2::SessionPrx& currentSession, const TestToke TestConfiguration& config = _configurations[currentState.config]; assert(!config.description.empty()); - bool found = false; SessionTuple session; for(vector<SessionTuple>::const_iterator i = _sessions.begin(); i != _sessions.end() && !found; ++i) diff --git a/cpp/test/Glacier2/router/Client.cpp b/cpp/test/Glacier2/router/Client.cpp index e759edf9135..5a38b1ae193 100644 --- a/cpp/test/Glacier2/router/Client.cpp +++ b/cpp/test/Glacier2/router/Client.cpp @@ -113,7 +113,6 @@ public: base = base->ice_oneway(); CallbackPrx callback = CallbackPrx::uncheckedCast(base); - // // Block the CallbackReceiver in wait() to prevent the client from // processing other incoming calls and wait to receive the callback. @@ -842,7 +841,6 @@ CallbackClient::run(int argc, char* argv[]) (*q)->getThreadControl().join(); } - cout << "ok" << endl; } diff --git a/cpp/test/Glacier2/sessionControl/SessionI.h b/cpp/test/Glacier2/sessionControl/SessionI.h index 72ac058941c..488a4b3e30f 100644 --- a/cpp/test/Glacier2/sessionControl/SessionI.h +++ b/cpp/test/Glacier2/sessionControl/SessionI.h @@ -19,7 +19,6 @@ public: virtual Glacier2::SessionPrx create(const std::string&, const Glacier2::SessionControlPrx&, const Ice::Current&); }; - class SessionI : public Test::Session { public: diff --git a/cpp/test/Glacier2/sessionHelper/Client.cpp b/cpp/test/Glacier2/sessionHelper/Client.cpp index d6001d1ebb4..a6485f282ef 100644 --- a/cpp/test/Glacier2/sessionHelper/Client.cpp +++ b/cpp/test/Glacier2/sessionHelper/Client.cpp @@ -126,7 +126,6 @@ private: return item; } - IceUtil::Monitor<IceUtil::Mutex> _monitor; #ifdef ICE_CPP11_MAPPING list<std::function<void()>> _queue; @@ -462,7 +461,6 @@ public: } cout << "ok" << endl; - cout << "uninstalling router with communicator... " << flush; communicator()->setDefaultRouter(0); cout << "ok" << endl; @@ -475,7 +473,6 @@ public: cout << "ok" << endl; } - Ice::ProcessPrxPtr process; { cout << "testing checked cast for admin object... " << flush; @@ -506,7 +503,6 @@ public: // IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(100)); - { IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor); cout << "testing SessionHelper connect after router shutdown... " << flush; @@ -569,7 +565,6 @@ private: } // Anonymous namespace end - int main(int argc, char* argv[]) { diff --git a/cpp/test/Ice/admin/AllTests.cpp b/cpp/test/Ice/admin/AllTests.cpp index 6fb11eed9a9..7c2f941207c 100644 --- a/cpp/test/Ice/admin/AllTests.cpp +++ b/cpp/test/Ice/admin/AllTests.cpp @@ -57,7 +57,6 @@ testFacets(const Ice::CommunicatorPtr& com, bool builtInFacets = true) test(facetMap.find("Facet2") != facetMap.end()); test(facetMap.find("Facet3") != facetMap.end()); - try { com->addAdminFacet(f1, "Facet1"); diff --git a/cpp/test/Ice/admin/TestI.cpp b/cpp/test/Ice/admin/TestI.cpp index 9740d4a2d91..bede35fbd14 100644 --- a/cpp/test/Ice/admin/TestI.cpp +++ b/cpp/test/Ice/admin/TestI.cpp @@ -55,8 +55,6 @@ public: } - - RemoteCommunicatorI::RemoteCommunicatorI(const Ice::CommunicatorPtr& communicator) : _communicator(communicator), #ifdef ICE_CPP11_MAPPING diff --git a/cpp/test/Ice/ami/AllTests.cpp b/cpp/test/Ice/ami/AllTests.cpp index 4d58e2e2165..035cc5249d6 100644 --- a/cpp/test/Ice/ami/AllTests.cpp +++ b/cpp/test/Ice/ami/AllTests.cpp @@ -956,7 +956,6 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) test(promise.get_future().get()); } - { p->ice_pingAsync(nullptr); } @@ -1460,7 +1459,6 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { } - try { p->ice_oneway()->opWithResultAsync().get(); @@ -2678,7 +2676,6 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { } - try { r = p->ice_oneway()->begin_opWithResult(); diff --git a/cpp/test/Ice/background/EndpointI.cpp b/cpp/test/Ice/background/EndpointI.cpp index 925b86c99af..a834a67df5b 100644 --- a/cpp/test/Ice/background/EndpointI.cpp +++ b/cpp/test/Ice/background/EndpointI.cpp @@ -285,7 +285,6 @@ EndpointI::operator==(const Ice::LocalObject& r) const return true; } - return *p->_endpoint == *_endpoint; } diff --git a/cpp/test/Ice/background/EndpointI.h b/cpp/test/Ice/background/EndpointI.h index 46231d7d602..551aea9be96 100644 --- a/cpp/test/Ice/background/EndpointI.h +++ b/cpp/test/Ice/background/EndpointI.h @@ -14,7 +14,6 @@ #include <Test.h> #include <Configuration.h> - class EndpointI; ICE_DEFINE_PTR(EndpointIPtr, EndpointI); diff --git a/cpp/test/Ice/background/PluginI.cpp b/cpp/test/Ice/background/PluginI.cpp index 6e41947132e..947ee566622 100644 --- a/cpp/test/Ice/background/PluginI.cpp +++ b/cpp/test/Ice/background/PluginI.cpp @@ -37,7 +37,6 @@ private: const ConfigurationPtr _configuration; }; - // // Plugin factory function. // diff --git a/cpp/test/Ice/background/Server.cpp b/cpp/test/Ice/background/Server.cpp index 1811e94a7ae..539721aebe5 100644 --- a/cpp/test/Ice/background/Server.cpp +++ b/cpp/test/Ice/background/Server.cpp @@ -124,7 +124,6 @@ private: BackgroundControllerIPtr _controller; }; - int run(int, char**, const Ice::CommunicatorPtr& communicator) { diff --git a/cpp/test/Ice/background/TestI.h b/cpp/test/Ice/background/TestI.h index ed08cbb5e80..6773c0a8ca2 100644 --- a/cpp/test/Ice/background/TestI.h +++ b/cpp/test/Ice/background/TestI.h @@ -38,7 +38,6 @@ class BackgroundControllerI : public Test::BackgroundController, IceUtil::Monito { public: - virtual void pauseCall(ICE_IN(std::string), const Ice::Current&); virtual void resumeCall(ICE_IN(std::string), const Ice::Current&); virtual void checkCallPause(const Ice::Current&); diff --git a/cpp/test/Ice/custom/AllTests.cpp b/cpp/test/Ice/custom/AllTests.cpp index 54c79bac846..3c7774a09b6 100644 --- a/cpp/test/Ice/custom/AllTests.cpp +++ b/cpp/test/Ice/custom/AllTests.cpp @@ -565,7 +565,6 @@ typedef IceUtil::Handle<Callback> CallbackPtr; #endif - Test::TestIntfPrxPtr allTests(const Ice::CommunicatorPtr& communicator) { @@ -1235,7 +1234,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } cout << "ok" << endl; - cout << "testing alternate strings with AMI... " << flush; { Util::string_view in = "HELLO WORLD!"; @@ -1947,7 +1945,6 @@ allTests(const Ice::CommunicatorPtr& communicator) #endif } - { Test::ByteSeq in; in.push_back('1'); @@ -2081,7 +2078,6 @@ allTests(const Ice::CommunicatorPtr& communicator) #endif } - { Test::BoolSeq in(5); in[0] = false; @@ -2238,7 +2234,6 @@ allTests(const Ice::CommunicatorPtr& communicator) #endif } - { Test::ByteList in; in.push_back('1'); @@ -2852,7 +2847,6 @@ allTests(const Ice::CommunicatorPtr& communicator) #endif } - { deque<Test::E> in(5); in[0] = Test:: ICE_ENUM(E, E1); @@ -3102,7 +3096,6 @@ allTests(const Ice::CommunicatorPtr& communicator) #endif } - { Test::ByteSeq in; in.push_back('1'); @@ -3349,11 +3342,8 @@ allTests(const Ice::CommunicatorPtr& communicator) } cout << "ok" << endl; - - #ifndef ICE_CPP11_MAPPING - cout << "testing class mapped structs ... " << flush; Test::ClassStructPtr cs = new Test::ClassStruct(); cs->y = 10; diff --git a/cpp/test/Ice/custom/StringConverterI.cpp b/cpp/test/Ice/custom/StringConverterI.cpp index 1ae3c702114..5515e0f62a6 100644 --- a/cpp/test/Ice/custom/StringConverterI.cpp +++ b/cpp/test/Ice/custom/StringConverterI.cpp @@ -39,7 +39,6 @@ Test::StringConverterI::fromUTF8(const Byte* sourceStart, const Byte* sourceEnd, } } - Byte* Test::WstringConverterI::toUTF8(const wchar_t* sourceStart, const wchar_t* sourceEnd, UTF8Buffer& buffer) const { diff --git a/cpp/test/Ice/custom/StringView.h b/cpp/test/Ice/custom/StringView.h index b78fae1a06e..7f47aff8432 100644 --- a/cpp/test/Ice/custom/StringView.h +++ b/cpp/test/Ice/custom/StringView.h @@ -130,7 +130,6 @@ operator!=(string_view lhs, string_view rhs) } - namespace Ice { diff --git a/cpp/test/Ice/custom/Test.ice b/cpp/test/Ice/custom/Test.ice index 7a3f65bb4e0..1e4cf32fb01 100644 --- a/cpp/test/Ice/custom/Test.ice +++ b/cpp/test/Ice/custom/Test.ice @@ -162,8 +162,6 @@ interface TestIntf opVariableRangeType(["cpp:range:std::deque< ::Test::Variable>"] VariableList inSeq, out ["cpp:range:std::deque< ::Test::Variable>"] VariableList outSeq); - - ["cpp:type:std::deque<bool>"] BoolSeq opBoolSeq(["cpp:type:std::deque<bool>"] BoolSeq inSeq, out ["cpp:type:std::deque<bool>"]BoolSeq outSeq); @@ -184,12 +182,10 @@ interface TestIntf ["cpp:type:MyByteSeq"] ByteSeq opMyByteSeq(["cpp:type:MyByteSeq"] ByteSeq inSeq, out ["cpp:type:MyByteSeq"] ByteSeq outSeq); - ["cpp:view-type:Util::string_view"] string opString(["cpp:view-type:Util::string_view"] string inString, out ["cpp:view-type:Util::string_view"] string outString); - ["cpp:type:std::deque<std::string>"] StringSeq opStringSeq(["cpp:type:std::deque<std::string>"] StringSeq inSeq, out ["cpp:type:std::deque<std::string>"] StringSeq outSeq); @@ -243,13 +239,11 @@ interface TestIntf opVarDict(["cpp:type:::Test::CustomMap<std::string, ::Ice::Int>"] StringIntDict idict, out ["cpp:type:::Test::CustomMap<std::string, ::Ice::Int>"] StringIntDict odict); - ["cpp:view-type:::std::map< ::Ice::Int, ::Util::string_view>", "cpp:type:::Test::CustomMap< ::Ice::Int, std::string>"] IntStringDict opCustomIntStringDict( ["cpp:view-type:::std::map< ::Ice::Int, ::Util::string_view>", "cpp:type:::Test::CustomMap< ::Ice::Int, std::string>"] IntStringDict idict, out ["cpp:view-type:::std::map< ::Ice::Int, ::Util::string_view>", "cpp:type:::Test::CustomMap< ::Ice::Int, std::string>"] IntStringDict odict); - ShortBuffer opShortBuffer(ShortBuffer inS, out ShortBuffer outS); ["cpp:type:::Test::CustomBuffer<bool>"] BoolSeq opBoolBuffer( diff --git a/cpp/test/Ice/custom/TestAMD.ice b/cpp/test/Ice/custom/TestAMD.ice index 8c821819fa0..c649c4b7460 100644 --- a/cpp/test/Ice/custom/TestAMD.ice +++ b/cpp/test/Ice/custom/TestAMD.ice @@ -172,7 +172,6 @@ struct BufferStruct ["cpp:type:MyByteSeq"] ByteSeq opMyByteSeq(["cpp:type:MyByteSeq"] ByteSeq inSeq, out ["cpp:type:MyByteSeq"] ByteSeq outSeq); - ["cpp:view-type:Util::string_view"] string opString(["cpp:view-type:Util::string_view"] string inString, out ["cpp:view-type:Util::string_view"] string outString); @@ -235,7 +234,6 @@ struct BufferStruct ["cpp:view-type:::std::map< ::Ice::Int, ::Util::string_view>", "cpp:type:::Test::CustomMap< ::Ice::Int, std::string>"] IntStringDict idict, out ["cpp:view-type:::std::map< ::Ice::Int, ::Util::string_view>", "cpp:type:::Test::CustomMap< ::Ice::Int, std::string>"] IntStringDict odict); - ShortBuffer opShortBuffer(ShortBuffer inS, out ShortBuffer outS); ["cpp:type:::Test::CustomBuffer<bool>"] BoolSeq opBoolBuffer( diff --git a/cpp/test/Ice/custom/TestAMDI.cpp b/cpp/test/Ice/custom/TestAMDI.cpp index 3b710d9bf45..f23a343a7fd 100644 --- a/cpp/test/Ice/custom/TestAMDI.cpp +++ b/cpp/test/Ice/custom/TestAMDI.cpp @@ -77,7 +77,6 @@ TestIntfI::opVariableRangeAsync(Test::VariableList in, response(in, in); } - void TestIntfI::opByteRangeTypeAsync(Test::ByteList in, std::function<void(const Test::ByteList&, const Test::ByteList&)> response, @@ -103,7 +102,6 @@ TestIntfI::opBoolSeqAsync(std::deque<bool> in, response(in, in); } - void TestIntfI::opBoolListAsync(Test::BoolList in, std::function<void(const Test::BoolList&, const Test::BoolList&)> response, @@ -177,7 +175,6 @@ TestIntfI::opFixedListAsync(Test::FixedList in, response(in, in); } - void TestIntfI::opVariableSeqAsync(std::deque<Test::Variable> in, std::function<void(const std::deque<Test::Variable>&, @@ -327,7 +324,6 @@ TestIntfI::opShortBufferAsync(Test::ShortBuffer in, response(in, in); } - void TestIntfI::opBoolBufferAsync(Test::CustomBuffer<bool> in, std::function<void(const Test::CustomBuffer<bool>&, @@ -345,7 +341,6 @@ TestIntfI::opBufferStructAsync(Test::BufferStruct in, response(in); } - void TestIntfI::shutdownAsync(std::function<void()> response, std::function<void(std::exception_ptr)>, const Ice::Current&) @@ -629,7 +624,6 @@ TestIntfI::opClassStruct_async(const Test::AMD_TestIntf_opClassStructPtr& cb, cb->ice_response(inS, inS, inSeq); } - void TestIntfI::opOutArrayByteSeq_async(const Test::AMD_TestIntf_opOutArrayByteSeqPtr& cb, const Test::ByteSeq& inS, diff --git a/cpp/test/Ice/custom/TestAMDI.h b/cpp/test/Ice/custom/TestAMDI.h index af4d3532898..aafc85fac28 100644 --- a/cpp/test/Ice/custom/TestAMDI.h +++ b/cpp/test/Ice/custom/TestAMDI.h @@ -24,12 +24,10 @@ public: std::function<void(const ::Test::DoubleSeq&, const ::Test::DoubleSeq&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opBoolArrayAsync(std::pair<const bool*, const bool*>, std::function<void(const ::Test::BoolSeq&, const ::Test::BoolSeq&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opByteArrayAsync(std::pair<const ::Ice::Byte*, const ::Ice::Byte*>, std::function<void(const std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&, const std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&)>, @@ -43,7 +41,6 @@ public: std::function<void(const ::Test::BoolSeq&, const ::Test::BoolSeq&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opByteRangeAsync(Test::ByteList, std::function<void(const Test::ByteList&, const Test::ByteList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; @@ -52,48 +49,39 @@ public: std::function<void(const ::Test::VariableList&, const ::Test::VariableList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opByteRangeTypeAsync(Test::ByteList, std::function<void(const ::Test::ByteList&, const ::Test::ByteList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opVariableRangeTypeAsync(Test::VariableList, std::function<void(const ::Test::VariableList&, const ::Test::VariableList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opBoolSeqAsync(std::deque<bool>, std::function<void(const std::deque<bool>&, const std::deque<bool>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opBoolListAsync(::Test::BoolList, std::function<void(const ::Test::BoolList&, const ::Test::BoolList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opByteSeqAsync(std::deque< ::Ice::Byte>, std::function<void(const std::deque< ::Ice::Byte>&, const std::deque< ::Ice::Byte>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opByteListAsync(::Test::ByteList, std::function<void(const ::Test::ByteList&, const ::Test::ByteList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opMyByteSeqAsync(MyByteSeq, std::function<void(const MyByteSeq&, const MyByteSeq&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opStringAsync(Util::string_view, std::function<void(const Util::string_view&, const Util::string_view&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opStringSeqAsync(std::deque<std::string>, std::function<void(const std::deque<std::string>&, const std::deque<std::string>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; @@ -102,18 +90,15 @@ public: std::function<void(const ::Test::StringList&, const ::Test::StringList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opFixedSeqAsync(std::deque< ::Test::Fixed>, std::function<void(const std::deque< ::Test::Fixed>&, const std::deque< ::Test::Fixed>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opFixedListAsync(::Test::FixedList, std::function<void(const ::Test::FixedList&, const ::Test::FixedList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opVariableSeqAsync(std::deque< ::Test::Variable>, std::function<void(const std::deque< ::Test::Variable>&, const std::deque< ::Test::Variable>&)>, @@ -123,104 +108,85 @@ public: std::function<void(const ::Test::VariableList&, const ::Test::VariableList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opStringStringDictSeqAsync(std::deque< ::Test::StringStringDict>, std::function<void(const std::deque< ::Test::StringStringDict>&, const std::deque< ::Test::StringStringDict>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opStringStringDictListAsync(::Test::StringStringDictList, std::function<void(const ::Test::StringStringDictList&, const ::Test::StringStringDictList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opESeqAsync(std::deque< ::Test::E>, std::function<void(const std::deque< ::Test::E>&, const std::deque< ::Test::E>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opEListAsync(::Test::EList, std::function<void(const ::Test::EList&, const ::Test::EList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opDPrxSeqAsync(std::deque<std::shared_ptr<::Test::DPrx>>, std::function<void(const std::deque<std::shared_ptr<::Test::DPrx>>&, const std::deque<std::shared_ptr<::Test::DPrx>>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opDPrxListAsync(::Test::DPrxList, std::function<void(const ::Test::DPrxList&, const ::Test::DPrxList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opCSeqAsync(std::deque<std::shared_ptr<Test::C>>, std::function<void(const std::deque<std::shared_ptr<Test::C>>&, const std::deque<std::shared_ptr<Test::C>>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opCListAsync(::Test::CList, std::function<void(const ::Test::CList&, const ::Test::CList&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opClassStructAsync(::Test::ClassStruct, ::Test::ClassStructSeq, std::function<void(const ::Test::ClassStruct&, const ::Test::ClassStruct&, const ::Test::ClassStructSeq&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opOutArrayByteSeqAsync(::Test::ByteSeq, std::function<void(const std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opOutRangeByteSeqAsync(::Test::ByteSeq, std::function<void(const Test::ByteSeq&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opIntStringDictAsync(::Test::IntStringDict, std::function<void(const ::Test::IntStringDict&, const ::Test::IntStringDict&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opVarDictAsync(::Test::CustomMap<std::string, ::Ice::Int>, std::function<void(const ::Test::CustomMap< ::Ice::Long, ::Ice::Long>&, const ::Test::CustomMap<std::string, ::Ice::Int>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opCustomIntStringDictAsync(std::map< ::Ice::Int, ::Util::string_view>, std::function<void(const std::map< ::Ice::Int, ::Util::string_view>&, const std::map< ::Ice::Int, ::Util::string_view>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opShortBufferAsync(::Test::ShortBuffer, std::function<void(const ::Test::ShortBuffer&, const ::Test::ShortBuffer&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opBoolBufferAsync(::Test::CustomBuffer<bool>, std::function<void(const ::Test::CustomBuffer<bool>&, const ::Test::CustomBuffer<bool>&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void opBufferStructAsync(::Test::BufferStruct, std::function<void(const ::Test::BufferStruct&)>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - void shutdownAsync(std::function<void()>, std::function<void(std::exception_ptr)>, const Ice::Current&) override; - #else virtual void opDoubleArray_async(const Test::AMD_TestIntf_opDoubleArrayPtr&, const std::pair<const Ice::Double*, const Ice::Double*>&, @@ -345,12 +311,10 @@ public: const ::Test::ClassStructSeq&, const ::Ice::Current&); - virtual void opOutArrayByteSeq_async(const ::Test::AMD_TestIntf_opOutArrayByteSeqPtr&, const ::Test::ByteSeq&, const ::Ice::Current&); - virtual void opOutRangeByteSeq_async(const ::Test::AMD_TestIntf_opOutRangeByteSeqPtr&, const ::Test::ByteSeq&, const ::Ice::Current&); diff --git a/cpp/test/Ice/custom/TestI.cpp b/cpp/test/Ice/custom/TestI.cpp index 7028b6b6412..0a78bc4d2c4 100644 --- a/cpp/test/Ice/custom/TestI.cpp +++ b/cpp/test/Ice/custom/TestI.cpp @@ -74,7 +74,6 @@ TestIntfI::opVariableRange(Test::VariableList inSeq, Test::VariableList& outSeq, return outSeq; } - Test::ByteList TestIntfI::opByteRangeType(Test::ByteList inSeq, Test::ByteList& outSeq, const Ice::Current&) { @@ -119,7 +118,6 @@ TestIntfI::opVariableRange( return outSeq; } - Test::ByteList TestIntfI::opByteRangeType(const std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>& inSeq, Test::ByteList& outSeq, @@ -239,8 +237,6 @@ TestIntfI::opString(ICE_IN(Util::string_view) inString, return outString; } - - std::deque< ::std::string> TestIntfI::opStringSeq(ICE_IN(std::deque< ::std::string>) inSeq, std::deque< ::std::string>& outSeq, @@ -444,8 +440,6 @@ TestIntfI::opCustomIntStringDict( return copy; } - - Test::ShortBuffer TestIntfI::opShortBuffer(ICE_IN(Test::ShortBuffer) inS, Test::ShortBuffer& outS, const Ice::Current&) { diff --git a/cpp/test/Ice/custom/TestI.h b/cpp/test/Ice/custom/TestI.h index 8ae965e20a6..75ab9bd279b 100644 --- a/cpp/test/Ice/custom/TestI.h +++ b/cpp/test/Ice/custom/TestI.h @@ -42,7 +42,6 @@ public: virtual Test::VariableList opVariableRange(Test::VariableList, Test::VariableList&, const Ice::Current&); - virtual Test::ByteList opByteRangeType(Test::ByteList, Test::ByteList&, const Ice::Current&); virtual Test::VariableList @@ -62,7 +61,6 @@ public: Test::VariableList&, const Ice::Current&); - virtual Test::ByteList opByteRangeType(const std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>&, Test::ByteList&, const Ice::Current&); @@ -117,7 +115,6 @@ public: std::string&, const Ice::Current&); - virtual std::deque< ::std::string> opStringSeq(ICE_IN(std::deque< ::std::string>), std::deque< ::std::string>&, const Ice::Current&); @@ -188,12 +185,10 @@ public: const Ice::Current&); #endif - virtual void opOutArrayByteSeq(ICE_IN(Test::ByteSeq), Test::ByteSeq&, const Ice::Current&); virtual void opOutRangeByteSeq(ICE_IN(Test::ByteSeq), Test::ByteSeq&, const Ice::Current&); - virtual Test::IntStringDict opIntStringDict(ICE_IN(Test::IntStringDict), Test::IntStringDict&, const Ice::Current&); @@ -201,7 +196,6 @@ public: Test::CustomMap<std::string, Ice::Int>&, const Ice::Current&); - virtual Test::CustomMap<Ice::Int, std::string> opCustomIntStringDict( ICE_IN(std::map<Ice::Int, Util::string_view>), Test::CustomMap<Ice::Int, std::string>&, const Ice::Current&); diff --git a/cpp/test/Ice/custom/WstringAMDI.cpp b/cpp/test/Ice/custom/WstringAMDI.cpp index b91f709e8b1..64dc327b507 100644 --- a/cpp/test/Ice/custom/WstringAMDI.cpp +++ b/cpp/test/Ice/custom/WstringAMDI.cpp @@ -62,7 +62,6 @@ Test2::WstringClassI::throwExceptAsync(std::wstring in, error(std::make_exception_ptr(ex)); } - #else void diff --git a/cpp/test/Ice/dispatcher/Dispatcher.cpp b/cpp/test/Ice/dispatcher/Dispatcher.cpp index 37bdc2df246..0f134d1b559 100644 --- a/cpp/test/Ice/dispatcher/Dispatcher.cpp +++ b/cpp/test/Ice/dispatcher/Dispatcher.cpp @@ -88,7 +88,6 @@ Dispatcher::run() } } - if(call) { try diff --git a/cpp/test/Ice/dispatcher/Dispatcher.h b/cpp/test/Ice/dispatcher/Dispatcher.h index ab80e78fc7b..199a048a267 100644 --- a/cpp/test/Ice/dispatcher/Dispatcher.h +++ b/cpp/test/Ice/dispatcher/Dispatcher.h @@ -55,7 +55,6 @@ public: virtual void dispatch(const Ice::DispatcherCallPtr&, const Ice::ConnectionPtr&); #endif - void run(); static void terminate(); diff --git a/cpp/test/Ice/dispatcher/TestI.h b/cpp/test/Ice/dispatcher/TestI.h index 3190a5dcba5..242ec868498 100644 --- a/cpp/test/Ice/dispatcher/TestI.h +++ b/cpp/test/Ice/dispatcher/TestI.h @@ -34,7 +34,6 @@ class TestIntfControllerI : public Test::TestIntfController, IceUtil::Monitor<Ic { public: - virtual void holdAdapter(const Ice::Current&); virtual void resumeAdapter(const Ice::Current&); diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp index 32302c5c6d8..25c227dc213 100644 --- a/cpp/test/Ice/exceptions/AllTests.cpp +++ b/cpp/test/Ice/exceptions/AllTests.cpp @@ -20,7 +20,6 @@ namespace const bool printException = false; } - class EmptyI : public virtual Empty { }; diff --git a/cpp/test/Ice/exceptions/TestAMD.ice b/cpp/test/Ice/exceptions/TestAMD.ice index 6cca12e0837..c9d0bdd086b 100644 --- a/cpp/test/Ice/exceptions/TestAMD.ice +++ b/cpp/test/Ice/exceptions/TestAMD.ice @@ -70,7 +70,6 @@ module Mod } } - ["amd"] interface Thrower { void shutdown(); diff --git a/cpp/test/Ice/exceptions/TestAMDI.cpp b/cpp/test/Ice/exceptions/TestAMDI.cpp index 7500ade1d6e..8d15c8d43c0 100644 --- a/cpp/test/Ice/exceptions/TestAMDI.cpp +++ b/cpp/test/Ice/exceptions/TestAMDI.cpp @@ -531,7 +531,6 @@ ThrowerI::throwModA_async(const AMD_Thrower_throwModAPtr& /*cb*/, throw ex; } - void ThrowerI::throwUndeclaredA_async(const AMD_Thrower_throwUndeclaredAPtr& cb, Ice::Int a, const Ice::Current&) @@ -591,7 +590,6 @@ ThrowerI::throwMemoryLimitException_async(const AMD_Thrower_throwMemoryLimitExce cb->ice_response(Ice::ByteSeq(1024 * 20)); // 20 KB. } - void ThrowerI::throwLocalExceptionIdempotent_async(const AMD_Thrower_throwLocalExceptionIdempotentPtr& cb, const Ice::Current&) diff --git a/cpp/test/Ice/gc/Client.cpp b/cpp/test/Ice/gc/Client.cpp index a2238ad0f28..a7b20ce2927 100644 --- a/cpp/test/Ice/gc/Client.cpp +++ b/cpp/test/Ice/gc/Client.cpp @@ -145,7 +145,6 @@ public: } }; - class MyApplication : public Ice::Application { public: diff --git a/cpp/test/Ice/gc/Test.ice b/cpp/test/Ice/gc/Test.ice index 1b645416055..7224ece230b 100644 --- a/cpp/test/Ice/gc/Test.ice +++ b/cpp/test/Ice/gc/Test.ice @@ -64,7 +64,6 @@ class Node // Sequence of structs defined above. - sequence<C2Dict> C2DictSeq; // Sequence of dictionary. sequence<CSeq> CSeqSeq; // Sequence of sequence. diff --git a/cpp/test/Ice/impl/Test.ice b/cpp/test/Ice/impl/Test.ice index 1cb1d5ca8e7..0876845b3b9 100644 --- a/cpp/test/Ice/impl/Test.ice +++ b/cpp/test/Ice/impl/Test.ice @@ -146,7 +146,6 @@ interface MyClass LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); diff --git a/cpp/test/Ice/impl/TestAMD.ice b/cpp/test/Ice/impl/TestAMD.ice index 2c469a23406..60de31074fe 100644 --- a/cpp/test/Ice/impl/TestAMD.ice +++ b/cpp/test/Ice/impl/TestAMD.ice @@ -144,7 +144,6 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); @@ -276,7 +275,6 @@ class MyClass1 string myClass1; // Same name as the enclosing class } - ["amd"] interface MyDerivedClass extends MyClass { void opDerived(); @@ -284,7 +282,6 @@ class MyClass1 MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); } - // // String literals // diff --git a/cpp/test/Ice/inheritance/Test.ice b/cpp/test/Ice/inheritance/Test.ice index 6245e88b13f..8c0b009de17 100644 --- a/cpp/test/Ice/inheritance/Test.ice +++ b/cpp/test/Ice/inheritance/Test.ice @@ -82,7 +82,6 @@ interface Initial MA::IC* icop(); } - module MC { diff --git a/cpp/test/Ice/interceptor/AMDInterceptorI.cpp b/cpp/test/Ice/interceptor/AMDInterceptorI.cpp index 40236a873d6..343fa2e1f1d 100644 --- a/cpp/test/Ice/interceptor/AMDInterceptorI.cpp +++ b/cpp/test/Ice/interceptor/AMDInterceptorI.cpp @@ -22,7 +22,6 @@ AMDInterceptorI::AMDInterceptorI(const Ice::ObjectPtr& servant) : { } - bool AMDInterceptorI::dispatch(Ice::Request& request) { @@ -148,7 +147,6 @@ DispatchInterceptorAsyncCallbackI::response() return true; } - bool DispatchInterceptorAsyncCallbackI::exception(const std::exception& ex) { diff --git a/cpp/test/Ice/interceptor/Client.cpp b/cpp/test/Ice/interceptor/Client.cpp index 2126b15161a..0ac42e9b69c 100644 --- a/cpp/test/Ice/interceptor/Client.cpp +++ b/cpp/test/Ice/interceptor/Client.cpp @@ -24,7 +24,6 @@ DEFINE_TEST("client") # include <signal.h> #endif - using namespace std; #if defined(__APPLE__) || defined(ICE_OS_UWP) @@ -185,7 +184,6 @@ ClientApp::run(int, char*[]) return rs; } - int ClientApp::run(const Test::MyObjectPrxPtr& prx, const InterceptorIPtr& interceptor) { diff --git a/cpp/test/Ice/interceptor/Test.ice b/cpp/test/Ice/interceptor/Test.ice index 8d221c4e4d3..bcb0dacc20c 100644 --- a/cpp/test/Ice/interceptor/Test.ice +++ b/cpp/test/Ice/interceptor/Test.ice @@ -82,5 +82,4 @@ interface MyObject } - } diff --git a/cpp/test/Ice/invoke/AllTests.cpp b/cpp/test/Ice/invoke/AllTests.cpp index 29f2eec1865..5749878d113 100644 --- a/cpp/test/Ice/invoke/AllTests.cpp +++ b/cpp/test/Ice/invoke/AllTests.cpp @@ -503,7 +503,6 @@ allTests(const Ice::CommunicatorPtr& communicator) in.endEncapsulation(); } - { promise<bool> completed; promise<void> sent; diff --git a/cpp/test/Ice/invoke/Server.cpp b/cpp/test/Ice/invoke/Server.cpp index de3904b9fa0..dd2ff498972 100644 --- a/cpp/test/Ice/invoke/Server.cpp +++ b/cpp/test/Ice/invoke/Server.cpp @@ -79,7 +79,6 @@ private: Ice::ObjectPtr _blobject; }; - int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { diff --git a/cpp/test/Ice/location/ServerLocator.h b/cpp/test/Ice/location/ServerLocator.h index 3314f7e0d6f..e48aca19193 100644 --- a/cpp/test/Ice/location/ServerLocator.h +++ b/cpp/test/Ice/location/ServerLocator.h @@ -20,7 +20,6 @@ public: ServerLocatorRegistry(); - #ifdef ICE_CPP11_MAPPING virtual void setAdapterDirectProxyAsync(std::string, std::shared_ptr<::Ice::ObjectPrx>, std::function<void()>, diff --git a/cpp/test/Ice/location/TestI.cpp b/cpp/test/Ice/location/TestI.cpp index 5c3bff8f9a5..6d6316a1457 100644 --- a/cpp/test/Ice/location/TestI.cpp +++ b/cpp/test/Ice/location/TestI.cpp @@ -81,7 +81,6 @@ ServerManagerI::shutdown(const Ice::Current& current) current.adapter->getCommunicator()->shutdown(); } - TestI::TestI(const Ice::ObjectAdapterPtr& adapter, const Ice::ObjectAdapterPtr& adapter2, const ServerLocatorRegistryPtr& registry) : diff --git a/cpp/test/Ice/logger/Client2.cpp b/cpp/test/Ice/logger/Client2.cpp index 311df0e169b..29da134dfe4 100644 --- a/cpp/test/Ice/logger/Client2.cpp +++ b/cpp/test/Ice/logger/Client2.cpp @@ -10,7 +10,6 @@ #include <Ice/Ice.h> #include <TestCommon.h> - using namespace std; namespace diff --git a/cpp/test/Ice/metrics/InstrumentationI.h b/cpp/test/Ice/metrics/InstrumentationI.h index bd446e426ae..61279101fa3 100644 --- a/cpp/test/Ice/metrics/InstrumentationI.h +++ b/cpp/test/Ice/metrics/InstrumentationI.h @@ -280,7 +280,6 @@ public: return connectionEstablishmentObserver; } - virtual Ice::Instrumentation::ObserverPtr getEndpointLookupObserver(const Ice::EndpointPtr&) { diff --git a/cpp/test/Ice/operations/Test.ice b/cpp/test/Ice/operations/Test.ice index c54c5daf1a2..d4c6f1c088a 100644 --- a/cpp/test/Ice/operations/Test.ice +++ b/cpp/test/Ice/operations/Test.ice @@ -146,7 +146,6 @@ interface MyClass LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); diff --git a/cpp/test/Ice/operations/TestAMD.ice b/cpp/test/Ice/operations/TestAMD.ice index 2c469a23406..60de31074fe 100644 --- a/cpp/test/Ice/operations/TestAMD.ice +++ b/cpp/test/Ice/operations/TestAMD.ice @@ -144,7 +144,6 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, out ShortSS p4, out IntSS p5, out LongSS p6); - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, out FloatSS p3, out DoubleSS p4); @@ -276,7 +275,6 @@ class MyClass1 string myClass1; // Same name as the enclosing class } - ["amd"] interface MyDerivedClass extends MyClass { void opDerived(); @@ -284,7 +282,6 @@ class MyClass1 MyStruct1 opMyStruct1(MyStruct1 opMyStruct1); } - // // String literals // diff --git a/cpp/test/Ice/operations/TestAMDI.cpp b/cpp/test/Ice/operations/TestAMDI.cpp index 21b49be2600..c0ecb21857b 100644 --- a/cpp/test/Ice/operations/TestAMDI.cpp +++ b/cpp/test/Ice/operations/TestAMDI.cpp @@ -136,7 +136,6 @@ MyDerivedClassI::opBoolAsync(bool p1, response(p2, p1); } - void MyDerivedClassI::opShortIntLongAsync(short p1, int p2, @@ -148,7 +147,6 @@ MyDerivedClassI::opShortIntLongAsync(short p1, response(p3, p1, p2, p3); } - void MyDerivedClassI::opFloatDoubleAsync(float p1, double p2, @@ -169,7 +167,6 @@ MyDerivedClassI::opStringAsync(string p1, response(p1 + " " + p2, p2 + " " + p1); } - void MyDerivedClassI::opMyEnumAsync(Test::MyEnum p1, function<void(Test::MyEnum, Test::MyEnum)> response, diff --git a/cpp/test/Ice/operations/TestI.cpp b/cpp/test/Ice/operations/TestI.cpp index a5a67fceb83..1d2de97466b 100644 --- a/cpp/test/Ice/operations/TestI.cpp +++ b/cpp/test/Ice/operations/TestI.cpp @@ -14,7 +14,6 @@ #include <functional> #include <iterator> - using namespace Ice; using namespace Test; using namespace std; @@ -840,7 +839,6 @@ MyDerivedClassI::opMStruct1(const Ice::Current& current) return OpMStruct1MarshaledResult(s, current); } - MyDerivedClassI::OpMStruct2MarshaledResult MyDerivedClassI::opMStruct2(ICE_IN(Test::Structure) p1, const Ice::Current& current) { diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp index 00ed62e9c58..00abaf9960e 100644 --- a/cpp/test/Ice/operations/Twoways.cpp +++ b/cpp/test/Ice/operations/Twoways.cpp @@ -371,7 +371,6 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& p) r->opVoid(); } - { Test::Structure si1; si1.p = p; diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp index 88b53469094..5f0c053db78 100644 --- a/cpp/test/Ice/operations/TwowaysAMI.cpp +++ b/cpp/test/Ice/operations/TwowaysAMI.cpp @@ -18,7 +18,6 @@ # pragma GCC diagnostic ignored "-Wstrict-aliasing" #endif - // // Disable VC++ warning // 4503: decorated name length exceeded, name was truncated diff --git a/cpp/test/Ice/optional/AllTests.cpp b/cpp/test/Ice/optional/AllTests.cpp index c09083da4b8..ba90f0a95a4 100644 --- a/cpp/test/Ice/optional/AllTests.cpp +++ b/cpp/test/Ice/optional/AllTests.cpp @@ -307,7 +307,6 @@ private: FPtr _f; }; - class FactoryI #ifndef ICE_CPP11_MAPPING : public Ice::ValueFactory @@ -541,7 +540,6 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) cout << "ok" << endl; - cout << "testing marshalling... " << flush; OneOptionalPtr oo4 = ICE_DYNAMIC_CAST(OneOptional, initial->pingPong(ICE_MAKE_SHARED(OneOptional))); test(!oo4->a); diff --git a/cpp/test/Ice/optional/StringView.h b/cpp/test/Ice/optional/StringView.h index b78fae1a06e..7f47aff8432 100644 --- a/cpp/test/Ice/optional/StringView.h +++ b/cpp/test/Ice/optional/StringView.h @@ -130,7 +130,6 @@ operator!=(string_view lhs, string_view rhs) } - namespace Ice { diff --git a/cpp/test/Ice/optional/TestAMDI.cpp b/cpp/test/Ice/optional/TestAMDI.cpp index 84f7fa16a6f..5d90f096a45 100644 --- a/cpp/test/Ice/optional/TestAMDI.cpp +++ b/cpp/test/Ice/optional/TestAMDI.cpp @@ -58,7 +58,6 @@ InitialI::opDerivedExceptionAsync(Ice::optional<int> a, Ice::optional<::std::str ex(make_exception_ptr(DerivedException(false, a, b, o, b, o))); } - void InitialI::opRequiredExceptionAsync(Ice::optional<int> a, Ice::optional<::std::string> b, Ice::optional<::std::shared_ptr<::Test::OneOptional>> o, ::std::function<void()>, @@ -320,7 +319,6 @@ InitialI::opIntIntDictAsync(Ice::optional<::Test::IntIntDict> p1, response(p1, p1); } - void InitialI::opStringIntDictAsync(Ice::optional<::Test::StringIntDict> p1, ::std::function<void(const Ice::optional<::Test::StringIntDict>&, const Ice::optional<::Test::StringIntDict>&)> response, @@ -557,7 +555,6 @@ InitialI::supportsNullOptionalAsync(::std::function<void(bool)> response, response(true); } - #else // C++98 mapping void @@ -636,7 +633,6 @@ InitialI::opByte_async(const ::Test::AMD_Initial_opBytePtr& cb, cb->ice_response(p1, p1); } - void InitialI::opBool_async(const ::Test::AMD_Initial_opBoolPtr& cb, const IceUtil::Optional<bool>& p1, diff --git a/cpp/test/Ice/optional/TestAMDI.h b/cpp/test/Ice/optional/TestAMDI.h index 941b4075996..e851ebf1696 100644 --- a/cpp/test/Ice/optional/TestAMDI.h +++ b/cpp/test/Ice/optional/TestAMDI.h @@ -12,7 +12,6 @@ #include <TestAMD.h> - class InitialI : public Test::Initial { public: @@ -36,7 +35,6 @@ public: ::std::function<void()>, ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override; - virtual void opRequiredExceptionAsync(Ice::optional<int>, Ice::optional<::std::string>, Ice::optional<::std::shared_ptr<::Test::OneOptional>>, ::std::function<void()>, ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override; @@ -45,17 +43,14 @@ public: ::std::function<void(const Ice::optional<::Ice::Byte>&, const Ice::optional<::Ice::Byte>&)>, ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override; - virtual void opBoolAsync(Ice::optional<bool>, ::std::function<void(const Ice::optional<bool>&, const Ice::optional<bool>&)>, ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override; - virtual void opShortAsync(Ice::optional<short>, ::std::function<void(const Ice::optional<short>&, const Ice::optional<short>&)>, ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override; - virtual void opIntAsync(Ice::optional<int>, ::std::function<void(const Ice::optional<int>&, const Ice::optional<int>&)>, ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override; @@ -148,7 +143,6 @@ public: ::std::function<void(const Ice::optional<::std::pair<const ::Test::FixedStruct*, const ::Test::FixedStruct*>>&, const Ice::optional<::std::pair<const ::Test::FixedStruct*, const ::Test::FixedStruct*>>&)>, ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override; - virtual void opFixedStructListAsync(Ice::optional<::std::pair<const ::Test::FixedStruct*, const ::Test::FixedStruct*>>, ::std::function<void(const Ice::optional<::std::pair<const ::Test::FixedStruct*, const ::Test::FixedStruct*>>&, const Ice::optional<::std::pair<const ::Test::FixedStruct*, const ::Test::FixedStruct*>>&)>, ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override; @@ -165,7 +159,6 @@ public: ::std::function<void(const Ice::optional<::Test::IntIntDict>&, const Ice::optional<::Test::IntIntDict>&)>, ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override; - virtual void opStringIntDictAsync(Ice::optional<::Test::StringIntDict>, ::std::function<void(const Ice::optional<::Test::StringIntDict>&, const Ice::optional<::Test::StringIntDict>&)>, ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override; @@ -290,7 +283,6 @@ public: virtual void supportsNullOptionalAsync(::std::function<void(bool)>, ::std::function<void(::std::exception_ptr)>, const Ice::Current&) override; - #else // C++98 mapping virtual void shutdown_async(const ::Test::AMD_Initial_shutdownPtr&, diff --git a/cpp/test/Ice/optional/TestI.cpp b/cpp/test/Ice/optional/TestI.cpp index 9a736a1c89d..9a583e28174 100644 --- a/cpp/test/Ice/optional/TestI.cpp +++ b/cpp/test/Ice/optional/TestI.cpp @@ -160,7 +160,6 @@ InitialI::opCustomString(ICE_IN(Optional<Util::string_view>) p1, Optional<string return p3; } - Optional<MyEnum> InitialI::opMyEnum(ICE_IN(Optional<MyEnum>) p1, Optional<MyEnum>& p3, const Current&) { @@ -413,7 +412,6 @@ InitialI::opCustomIntStringDict(ICE_IN(Optional<std::map<int, Util::string_view> return p3; } - void InitialI::opClassAndUnknownOptional(ICE_IN(APtr), const Ice::Current&) { diff --git a/cpp/test/Ice/optional/TestI.h b/cpp/test/Ice/optional/TestI.h index d1c2bb51fd8..d7a3c7a2e35 100644 --- a/cpp/test/Ice/optional/TestI.h +++ b/cpp/test/Ice/optional/TestI.h @@ -19,7 +19,6 @@ using OneOptionalPrxPtr = std::shared_ptr<Ice::ObjectPrx>; } #endif - class InitialI : public Test::Initial { public: diff --git a/cpp/test/Ice/plugin/Plugin.cpp b/cpp/test/Ice/plugin/Plugin.cpp index 35848649b71..7ac76a477ed 100644 --- a/cpp/test/Ice/plugin/Plugin.cpp +++ b/cpp/test/Ice/plugin/Plugin.cpp @@ -127,7 +127,6 @@ protected: BasePluginPtr _other; }; - class PluginOne : public BasePlugin { @@ -246,7 +245,6 @@ protected: BasePluginFailPtr _three; }; - class PluginOneFail : public BasePluginFail { diff --git a/cpp/test/Ice/properties/config/escapes.cfg b/cpp/test/Ice/properties/config/escapes.cfg index bd7c16643d9..a9d91a0a19f 100755 --- a/cpp/test/Ice/properties/config/escapes.cfg +++ b/cpp/test/Ice/properties/config/escapes.cfg @@ -22,7 +22,6 @@ foo\=bar=1 # Name is "foo=bar", value is "1" foo\#bar = 2 # Name is "foo#bar", value is "2" foo bar =3 # Name is "foo bar", value is "3" - A=1 # Name is "A", value is "1" B= 2 3 4 # Name is "B", value is "2 3 4" C=5=\#6 # 7 # Name is "C", value is "5=#6" diff --git a/cpp/test/Ice/slicing/objects/AllTests.cpp b/cpp/test/Ice/slicing/objects/AllTests.cpp index e35337d2de2..ee1600970fa 100644 --- a/cpp/test/Ice/slicing/objects/AllTests.cpp +++ b/cpp/test/Ice/slicing/objects/AllTests.cpp @@ -364,7 +364,6 @@ public: called(); } - void exception_throwUnknownDerivedAsBase(const ::Ice::Exception& ex) { diff --git a/cpp/test/Ice/slicing/objects/TestAMDI.cpp b/cpp/test/Ice/slicing/objects/TestAMDI.cpp index 46e8fa39ddc..a840e3af0cf 100644 --- a/cpp/test/Ice/slicing/objects/TestAMDI.cpp +++ b/cpp/test/Ice/slicing/objects/TestAMDI.cpp @@ -62,7 +62,6 @@ TestI::SBSKnownDerivedAsSBSKnownDerivedAsync(function<void(const shared_ptr<Test response(sbskd); } - void TestI::SBSUnknownDerivedAsSBaseAsync(function<void(const shared_ptr<Test::SBase>&)> response, function<void(exception_ptr)>, @@ -85,7 +84,6 @@ TestI::SBSUnknownDerivedAsSBaseCompactAsync(function<void(const shared_ptr<Test: response(sbsud); } - void TestI::SUnknownAsObjectAsync(function<void(const shared_ptr<Ice::Value>&)> response, function<void(exception_ptr)>, @@ -115,7 +113,6 @@ TestI::checkSUnknownAsync(Ice::ValuePtr obj, response(); } - void TestI::oneElementCycleAsync(function<void(const shared_ptr<Test::B>&)> response, function<void(exception_ptr)>, @@ -159,7 +156,6 @@ TestI::D1AsBAsync(function<void(const shared_ptr<Test::B>&)> response, response(d1); } - void TestI::D1AsD1Async(function<void(const shared_ptr<Test::D1>&)> response, function<void(exception_ptr)>, @@ -303,7 +299,6 @@ TestI::returnTest1Async(function<void(const shared_ptr<Test::B>&, response(d2, d2, d1); } - void TestI::returnTest2Async(function<void(const shared_ptr<Test::B>&, const shared_ptr<Test::B>&, @@ -334,7 +329,6 @@ TestI::returnTest3Async(shared_ptr<::Test::B> p1, response(p1); } - void TestI::sequenceTestAsync(shared_ptr<::Test::SS1> p1, shared_ptr<::Test::SS2> p2, @@ -348,7 +342,6 @@ TestI::sequenceTestAsync(shared_ptr<::Test::SS1> p1, response(ss); } - void TestI::dictionaryTestAsync(Test::BDict bin, function<void(const ::Test::BDict&, const ::Test::BDict&)> response, @@ -391,7 +384,6 @@ TestI::exchangePBaseAsync(shared_ptr<::Test::PBase> pb, response(pb); } - void TestI::PBSUnknownAsPreservedAsync(function<void(const shared_ptr<::Test::Preserved>&)> response, function<void(exception_ptr)>, @@ -455,7 +447,6 @@ TestI::PBSUnknownAsPreservedWithGraphAsync(function<void(const shared_ptr<::Test r->graph->next->next->next = nullptr; // Break the cycle. } - void TestI::checkPBSUnknownWithGraphAsync(shared_ptr<::Test::Preserved> p, function<void()> response, diff --git a/cpp/test/Ice/timeout/Server.cpp b/cpp/test/Ice/timeout/Server.cpp index f870738ad6e..ff4bb0b1329 100644 --- a/cpp/test/Ice/timeout/Server.cpp +++ b/cpp/test/Ice/timeout/Server.cpp @@ -28,7 +28,6 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) return EXIT_SUCCESS; } - int main(int argc, char* argv[]) { diff --git a/cpp/test/IceBox/configuration/config.service1-2 b/cpp/test/IceBox/configuration/config.service1-2 index 835acbadfc9..e7f07a370f2 100644 --- a/cpp/test/IceBox/configuration/config.service1-2 +++ b/cpp/test/IceBox/configuration/config.service1-2 @@ -7,5 +7,4 @@ Service1.ArgProp=1 OverrideMe=2 UnsetMe= - Ice.PrintAdapterReady=0 diff --git a/cpp/test/IceDiscovery/simple/Test.ice b/cpp/test/IceDiscovery/simple/Test.ice index 9375593e475..007fc57f2ac 100644 --- a/cpp/test/IceDiscovery/simple/Test.ice +++ b/cpp/test/IceDiscovery/simple/Test.ice @@ -9,7 +9,6 @@ #pragma once - module Test { diff --git a/cpp/test/IceGrid/activation/AllTests.cpp b/cpp/test/IceGrid/activation/AllTests.cpp index 4ddb3d64360..ec5add2a2db 100644 --- a/cpp/test/IceGrid/activation/AllTests.cpp +++ b/cpp/test/IceGrid/activation/AllTests.cpp @@ -85,7 +85,6 @@ private: }; typedef IceUtil::Handle<PingThread> PingThreadPtr; - void allTests(const Ice::CommunicatorPtr& communicator) { @@ -375,7 +374,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } cout << "ok" << endl; - cout << "testing server enable... " << flush; try { @@ -483,7 +481,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } threads.resize(0); - try { admin->startServer("invalid-pwd-no-oa"); @@ -602,7 +599,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } cout << "ok" << endl; - cout << "testing temporary disable on failure... " << flush; try { diff --git a/cpp/test/IceGrid/allocation/AllTests.cpp b/cpp/test/IceGrid/allocation/AllTests.cpp index ed50d2236d9..a5ec6e3b097 100644 --- a/cpp/test/IceGrid/allocation/AllTests.cpp +++ b/cpp/test/IceGrid/allocation/AllTests.cpp @@ -77,7 +77,6 @@ private: }; typedef IceUtil::Handle<Callback> CallbackPtr; - class StressClient : public IceUtil::Thread, public IceUtil::Monitor<IceUtil::Mutex> { public: diff --git a/cpp/test/IceGrid/deployer/AllTests.cpp b/cpp/test/IceGrid/deployer/AllTests.cpp index d5b03791891..28770a9d682 100644 --- a/cpp/test/IceGrid/deployer/AllTests.cpp +++ b/cpp/test/IceGrid/deployer/AllTests.cpp @@ -375,7 +375,6 @@ logTests(const Ice::CommunicatorPtr& comm, const AdminSessionPrx& session) cout << "ok" << endl; } - void allTests(const Ice::CommunicatorPtr& comm) { diff --git a/cpp/test/IceGrid/fileLock/test.py b/cpp/test/IceGrid/fileLock/test.py index 413675f0c36..b8e19fee6ee 100644 --- a/cpp/test/IceGrid/fileLock/test.py +++ b/cpp/test/IceGrid/fileLock/test.py @@ -19,5 +19,4 @@ class IceGridAdminTestCase(IceGridTestCase): registry.stop(current, False) print("ok") - TestSuite(__file__, [ IceGridAdminTestCase(application=None) ], runOnMainThread=True, multihost=False) diff --git a/cpp/test/IceGrid/replicaGroup/application.xml b/cpp/test/IceGrid/replicaGroup/application.xml index 74c91840a0c..0bf6c29e6b9 100644 --- a/cpp/test/IceGrid/replicaGroup/application.xml +++ b/cpp/test/IceGrid/replicaGroup/application.xml @@ -115,7 +115,6 @@ <icebox id="${id}" exe="${icebox.exe}" activation="on-demand" pwd="."> <service-instance template="Service" name="Service" replicaGroup="${replicaGroup}"/> - <!-- Dummy service with server lifetime adapter to ensure all the services are started when the server is marked as Active --> diff --git a/cpp/test/IceGrid/replication/AllTests.cpp b/cpp/test/IceGrid/replication/AllTests.cpp index 30a29cc307f..2e05ac615dc 100644 --- a/cpp/test/IceGrid/replication/AllTests.cpp +++ b/cpp/test/IceGrid/replication/AllTests.cpp @@ -1347,7 +1347,6 @@ allTests(const Ice::CommunicatorPtr& comm) } cout << "ok" << endl; - slave1Admin->shutdownNode("Node1"); removeServer(admin, "Node1"); diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp index e5561b31317..ef9ffedad52 100644 --- a/cpp/test/IceGrid/session/AllTests.cpp +++ b/cpp/test/IceGrid/session/AllTests.cpp @@ -620,7 +620,6 @@ allTests(const Ice::CommunicatorPtr& communicator) { } - session1->destroy(); session2->destroy(); @@ -1877,7 +1876,6 @@ allTests(const Ice::CommunicatorPtr& communicator) session->finishUpdate(); appObs1->waitForUpdate(__FILE__, __LINE__); - session->startUpdate(); admin->startServer("Server"); session->finishUpdate(); @@ -1965,7 +1963,6 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "ok" << endl; } - { cout << "testing observer with direct proxy... " << flush; AdminSessionPrx session1 = registry->createAdminSession("admin1", "test1"); diff --git a/cpp/test/IceGrid/simple/AllTests.cpp b/cpp/test/IceGrid/simple/AllTests.cpp index 125216db7a9..5ac51bf028b 100644 --- a/cpp/test/IceGrid/simple/AllTests.cpp +++ b/cpp/test/IceGrid/simple/AllTests.cpp @@ -167,7 +167,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } com->destroy(); - initData.properties = communicator->getProperties()->clone(); initData.properties->setProperty("Ice.Default.Locator", ""); initData.properties->setProperty("Ice.Plugin.IceLocatorDiscovery", diff --git a/cpp/test/IceSSL/certs/makecerts.py b/cpp/test/IceSSL/certs/makecerts.py index c79e8a8c614..aa385871fb4 100755 --- a/cpp/test/IceSSL/certs/makecerts.py +++ b/cpp/test/IceSSL/certs/makecerts.py @@ -175,7 +175,6 @@ if clean or not os.path.exists("dh_params512.der"): if clean or not os.path.exists("dh_params1024.der"): ca1.run("openssl", "dhparam", 1024, outform="DER", out="dh_params1024.der") - # # Create certificate with custom extensions # diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index e02c53be0a9..d2639da505e 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -727,7 +727,6 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) string sep = ":"; #endif - #ifdef ICE_USE_OPENSSL Ice::Long openSSLVersion; { @@ -944,7 +943,6 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) server->checkCert(clientCert->getSubjectDN(), clientCert->getIssuerDN()); #endif - // // Validate that we can get the connection info. Validate // that the certificates have the same DN. diff --git a/cpp/test/IceStorm/federation2/Makefile.mk b/cpp/test/IceStorm/federation2/Makefile.mk index f4bbc702ddb..9758f091318 100644 --- a/cpp/test/IceStorm/federation2/Makefile.mk +++ b/cpp/test/IceStorm/federation2/Makefile.mk @@ -15,5 +15,4 @@ $(test)_subscriber_sources = Subscriber.cpp Event.ice $(test)_cleanfiles = db/* 0.db/* 1.db/* 2.db/* db2/* 0.db2/* 1.db2/* 2.db2/* - tests += $(test) diff --git a/cpp/test/IceStorm/stress/Subscriber.cpp b/cpp/test/IceStorm/stress/Subscriber.cpp index d7c255f9177..7f7832e8bd6 100644 --- a/cpp/test/IceStorm/stress/Subscriber.cpp +++ b/cpp/test/IceStorm/stress/Subscriber.cpp @@ -257,7 +257,6 @@ private: int _expected; }; - class ControllerEventI: public EventI { public: diff --git a/cpp/test/IceUtil/priority/PriorityInversion.cpp b/cpp/test/IceUtil/priority/PriorityInversion.cpp index cef271f5135..9d8117e92e0 100644 --- a/cpp/test/IceUtil/priority/PriorityInversion.cpp +++ b/cpp/test/IceUtil/priority/PriorityInversion.cpp @@ -134,7 +134,6 @@ private: }; typedef IceUtil::Handle<TaskCollector> TaskCollectorPtr; - class SharedResource : public IceUtil::Shared { public: @@ -194,7 +193,6 @@ private: IceUtil::Mutex _mutex; }; - class SharedResourceRecMutex : public SharedResource { public: diff --git a/cpp/test/IceUtil/priority/TestSuite.cpp b/cpp/test/IceUtil/priority/TestSuite.cpp index 16ee2f1d05f..4b1bc6b938a 100644 --- a/cpp/test/IceUtil/priority/TestSuite.cpp +++ b/cpp/test/IceUtil/priority/TestSuite.cpp @@ -7,7 +7,6 @@ // // ********************************************************************** - #include <IceUtil/MutexProtocol.h> #include <TestSuite.h> diff --git a/cpp/test/IceUtil/priority/TimerPriority.cpp b/cpp/test/IceUtil/priority/TimerPriority.cpp index cc0b1c9f4ae..44b35acc0fd 100644 --- a/cpp/test/IceUtil/priority/TimerPriority.cpp +++ b/cpp/test/IceUtil/priority/TimerPriority.cpp @@ -15,7 +15,6 @@ using namespace std; using namespace IceUtil; - static const string priorityTestName("timer priority"); TimerPriorityTest::TimerPriorityTest() : diff --git a/cpp/test/IceUtil/stacktrace/Client.cpp b/cpp/test/IceUtil/stacktrace/Client.cpp index 73c93c54219..d616a148557 100644 --- a/cpp/test/IceUtil/stacktrace/Client.cpp +++ b/cpp/test/IceUtil/stacktrace/Client.cpp @@ -15,7 +15,6 @@ using namespace IceUtil; using namespace std; - namespace IceUtilInternal { extern bool ICE_API printStackTraces; @@ -238,14 +237,12 @@ int main(int argc, char* argv[]) break; } - cerr << "could not find `" << expected[i] << "` in " << actual[i] << endl; cerr << "Full stack is:\n" << stack << endl; test(false); } } - if(!match) { if(filename.find("StackTrace.release-vc") == 0) diff --git a/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp b/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp index 49dd5946be6..f9717ae5a1b 100644 --- a/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp +++ b/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp @@ -106,7 +106,6 @@ MonitorRecMutexTest::run() ThreadControl control; ThreadControl control2; - { Monitor<RecMutex>::Lock lock(monitor); diff --git a/cpp/test/IceUtil/timer/Client.cpp b/cpp/test/IceUtil/timer/Client.cpp index be2400d8f25..12a9b5c26bf 100644 --- a/cpp/test/IceUtil/timer/Client.cpp +++ b/cpp/test/IceUtil/timer/Client.cpp @@ -114,7 +114,6 @@ private: }; ICE_DEFINE_PTR(TestTaskPtr, TestTask); - class DestroyTask : public IceUtil::TimerTask, IceUtil::Monitor<IceUtil::Mutex> { public: diff --git a/cpp/test/IceUtil/unicode/Client.cpp b/cpp/test/IceUtil/unicode/Client.cpp index 79e515e99ed..174f970a768 100644 --- a/cpp/test/IceUtil/unicode/Client.cpp +++ b/cpp/test/IceUtil/unicode/Client.cpp @@ -272,7 +272,6 @@ main(int argc, char* argv[]) #endif - { cout << "testing error handling... "; diff --git a/cpp/test/IceUtil/uuid/Client.cpp b/cpp/test/IceUtil/uuid/Client.cpp index 0a5ceae5537..f04ef882949 100644 --- a/cpp/test/IceUtil/uuid/Client.cpp +++ b/cpp/test/IceUtil/uuid/Client.cpp @@ -84,7 +84,6 @@ public: } } - private: int _threadId; diff --git a/cpp/test/Slice/headers/slices/dir2/b.ice b/cpp/test/Slice/headers/slices/dir2/b.ice index 0c7207ccc57..5b72f38add2 100644 --- a/cpp/test/Slice/headers/slices/dir2/b.ice +++ b/cpp/test/Slice/headers/slices/dir2/b.ice @@ -1,5 +1,4 @@ - #include <dir1/a1.ice> #include <linktodir1/a2.ice> #include <linktodir1/linktoa3.ice> diff --git a/cpp/test/include/TestHelper.h b/cpp/test/include/TestHelper.h index 417afb531cc..4453e8498a7 100644 --- a/cpp/test/include/TestHelper.h +++ b/cpp/test/include/TestHelper.h @@ -18,7 +18,6 @@ namespace Test { - class MainHelper : public std::streambuf { public: diff --git a/cpp/test/ios/controller/Classes/AppDelegate.h b/cpp/test/ios/controller/Classes/AppDelegate.h index bdbf2a2e808..69088212d4b 100644 --- a/cpp/test/ios/controller/Classes/AppDelegate.h +++ b/cpp/test/ios/controller/Classes/AppDelegate.h @@ -13,5 +13,4 @@ @property (strong, nonatomic) UIWindow *window; - @end diff --git a/cpp/test/ios/controller/Classes/AppDelegate.m b/cpp/test/ios/controller/Classes/AppDelegate.m index 405da278fb7..74a582f002b 100644 --- a/cpp/test/ios/controller/Classes/AppDelegate.m +++ b/cpp/test/ios/controller/Classes/AppDelegate.m @@ -15,38 +15,31 @@ @implementation AppDelegate - - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { // Override point for customization after application launch. return YES; } - - (void)applicationWillResignActive:(UIApplication *)application { // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game. } - - (void)applicationDidEnterBackground:(UIApplication *)application { // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. } - - (void)applicationWillEnterForeground:(UIApplication *)application { // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background. } - - (void)applicationDidBecomeActive:(UIApplication *)application { // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. } - - (void)applicationWillTerminate:(UIApplication *)application { // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. } - @end diff --git a/cpp/test/uwp/controller/ViewController.xaml.h b/cpp/test/uwp/controller/ViewController.xaml.h index a35af555017..77852ec9bd2 100644 --- a/cpp/test/uwp/controller/ViewController.xaml.h +++ b/cpp/test/uwp/controller/ViewController.xaml.h @@ -33,7 +33,6 @@ public: ViewController(); virtual ~ViewController(); - protected: virtual void OnNavigatedTo(Windows::UI::Xaml::Navigation::NavigationEventArgs^ e) override; |