diff options
Diffstat (limited to 'cpp')
63 files changed, 166 insertions, 89 deletions
diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h index 8cbeeed2c91..eeae4a8b993 100644 --- a/cpp/include/Ice/Initialize.h +++ b/cpp/include/Ice/Initialize.h @@ -90,15 +90,39 @@ struct InitializationData BatchRequestInterceptorPtr batchRequestInterceptor; }; -ICE_API CommunicatorPtr initialize(int&, char*[], const InitializationData& = InitializationData(), - Int = ICE_INT_VERSION); +#ifdef ICE_CPP11_MAPPING -ICE_API CommunicatorPtr initialize(Ice::StringSeq&, const InitializationData& = InitializationData(), - Int = ICE_INT_VERSION); +class ICE_API CommunicatorHolder +{ +public: + + CommunicatorHolder(std::shared_ptr<Ice::Communicator>&&); + + CommunicatorHolder(CommunicatorHolder&&) = default; + CommunicatorHolder(CommunicatorHolder&) = delete; + CommunicatorHolder& operator=(CommunicatorHolder&&) = default; + + ~CommunicatorHolder(); + + const std::shared_ptr<Ice::Communicator>& communicator() const; + std::shared_ptr<Ice::Communicator> release(); + const std::shared_ptr<Ice::Communicator>& operator->() const; + +private: + + std::shared_ptr<Ice::Communicator> _communicator; +}; + +#endif + +ICE_API ICE_COMMUNICATOR_HOLDER initialize(int&, char*[], const InitializationData& = InitializationData(), + Int = ICE_INT_VERSION); -ICE_API CommunicatorPtr initialize(const InitializationData& = InitializationData(), - Int = ICE_INT_VERSION); +ICE_API ICE_COMMUNICATOR_HOLDER initialize(Ice::StringSeq&, const InitializationData& = InitializationData(), + Int = ICE_INT_VERSION); +ICE_API ICE_COMMUNICATOR_HOLDER initialize(const InitializationData& = InitializationData(), + Int = ICE_INT_VERSION); ICE_API InputStreamPtr createInputStream(const CommunicatorPtr&, const ::std::vector< Byte >&); ICE_API InputStreamPtr createInputStream(const CommunicatorPtr&, const ::std::vector< Byte >&, diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index a3e5b083aa2..d80e1a0a426 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -268,6 +268,8 @@ typedef long long Int64; # define ICE_CHECKED_CAST(T,V) Ice::checkedCast<T>(V) # define ICE_UNCHECKED_CAST(T,V) Ice::uncheckedCast<T>(V) # define ICE_VALUE_FACTORY ::std::function<::Ice::ValuePtr (const std::string& type)> +# define ICE_COMMUNICATOR_HOLDER Ice::CommunicatorHolder +# define ICE_COMMUNICATOR_HOLDER_RELEASE(T) T.release() #else // C++98 mapping # define ICE_HANDLE ::IceUtil::Handle # define ICE_INTERNAL_HANDLE ::IceInternal::Handle @@ -282,6 +284,8 @@ typedef long long Int64; # define ICE_CHECKED_CAST(T,V) T::checkedCast(V) # define ICE_UNCHECKED_CAST(T,V) T::uncheckedCast(V) # define ICE_VALUE_FACTORY ::Ice::ValueFactoryPtr +# define ICE_COMMUNICATOR_HOLDER Ice::CommunicatorPtr +# define ICE_COMMUNICATOR_HOLDER_RELEASE(T) T #endif #endif diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp index 59a0c8d4551..3bf6f597cca 100644 --- a/cpp/src/Ice/Application.cpp +++ b/cpp/src/Ice/Application.cpp @@ -665,7 +665,7 @@ Ice::Application::doMain(int argc, char* argv[], const InitializationData& initD IceUtil::getProcessStringConverter())); } - IceInternal::Application::_communicator = initialize(argc, argv, initData); + IceInternal::Application::_communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(initialize(argc, argv, initData)); IceInternal::Application::_destroyed = false; // diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h index 277d573b04b..72245853234 100644 --- a/cpp/src/Ice/CommunicatorI.h +++ b/cpp/src/Ice/CommunicatorI.h @@ -112,9 +112,9 @@ private: // void finishSetup(int&, char*[]); - friend ICE_API CommunicatorPtr initialize(int&, char*[], const InitializationData&, Int); - friend ICE_API CommunicatorPtr initialize(StringSeq&, const InitializationData&, Int); - friend ICE_API CommunicatorPtr initialize(const InitializationData&, Int); + friend ICE_API ICE_COMMUNICATOR_HOLDER initialize(int&, char*[], const InitializationData&, Int); + friend ICE_API ICE_COMMUNICATOR_HOLDER initialize(StringSeq&, const InitializationData&, Int); + friend ICE_API ICE_COMMUNICATOR_HOLDER initialize(const InitializationData&, Int); friend ICE_API ::IceInternal::InstancePtr IceInternal::getInstance(const ::Ice::CommunicatorPtr&); friend ICE_API ::IceUtil::TimerPtr IceInternal::getInstanceTimer(const ::Ice::CommunicatorPtr&); diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index 66d8db8315a..e88b339696c 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -208,7 +208,43 @@ inline void checkIceVersion(Int version) } -CommunicatorPtr +#ifdef ICE_CPP11_MAPPING + +Ice::CommunicatorHolder::CommunicatorHolder(shared_ptr<Ice::Communicator>&& communicator) : + _communicator(move(communicator)) +{ +} + +Ice::CommunicatorHolder::~CommunicatorHolder() +{ + if(_communicator) + { + _communicator->destroy(); + } +} + +const shared_ptr<Ice::Communicator>& +Ice::CommunicatorHolder::communicator() const +{ + return _communicator; +} + +shared_ptr<Ice::Communicator> +Ice::CommunicatorHolder::release() +{ + return move(_communicator); +} + +const shared_ptr<Ice::Communicator>& +Ice::CommunicatorHolder::operator->() const +{ + return _communicator; +} +#endif + + + +ICE_COMMUNICATOR_HOLDER Ice::initialize(int& argc, char* argv[], const InitializationData& initializationData, Int version) { checkIceVersion(version); @@ -218,19 +254,27 @@ Ice::initialize(int& argc, char* argv[], const InitializationData& initializatio CommunicatorIPtr communicator = CommunicatorI::create(initData); communicator->finishSetup(argc, argv); +#ifdef ICE_CPP11_MAPPING + return CommunicatorHolder(move(communicator)); +#else return communicator; +#endif } -CommunicatorPtr +ICE_COMMUNICATOR_HOLDER Ice::initialize(StringSeq& args, const InitializationData& initializationData, Int version) { IceUtilInternal::ArgVector av(args); - CommunicatorPtr communicator = initialize(av.argc, av.argv, initializationData, version); + ICE_COMMUNICATOR_HOLDER communicator = initialize(av.argc, av.argv, initializationData, version); args = argsToStringSeq(av.argc, av.argv); +#ifdef ICE_CPP11_MAPPING + return move(communicator); +#else return communicator; +#endif } -CommunicatorPtr +ICE_COMMUNICATOR_HOLDER Ice::initialize(const InitializationData& initData, Int version) { // @@ -243,7 +287,11 @@ Ice::initialize(const InitializationData& initData, Int version) int argc = 0; char* argv[] = { 0 }; communicator->finishSetup(argc, argv); +#ifdef ICE_CPP11_MAPPING + return CommunicatorHolder(move(communicator)); +#else return communicator; +#endif } #ifndef ICE_CPP11_MAPPING diff --git a/cpp/src/Ice/LoggerAdminI.cpp b/cpp/src/Ice/LoggerAdminI.cpp index a213026fcf3..bb42febfaa7 100644 --- a/cpp/src/Ice/LoggerAdminI.cpp +++ b/cpp/src/Ice/LoggerAdminI.cpp @@ -313,7 +313,8 @@ createSendLogCommunicator(const CommunicatorPtr& communicator, const LoggerPtr& } initData.properties->parseCommandLineOptions("", extraProps); } - return initialize(initData); + + return ICE_COMMUNICATOR_HOLDER_RELEASE(initialize(initData)); } // diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp index 3ed40a27d6c..a1fd7da71e7 100644 --- a/cpp/src/Ice/Service.cpp +++ b/cpp/src/Ice/Service.cpp @@ -960,7 +960,7 @@ Ice::Service::stop() Ice::CommunicatorPtr Ice::Service::initializeCommunicator(int& argc, char* argv[], const InitializationData& initData) { - return Ice::initialize(argc, argv, initData); + return ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); } void diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp index c1661d22975..5791484f810 100644 --- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp +++ b/cpp/test/Ice/adapterDeactivation/AllTests.cpp @@ -67,7 +67,7 @@ allTests(const CommunicatorPtr& communicator) { Ice::InitializationData initData; initData.properties = communicator->getProperties()->clone(); - Ice::CommunicatorPtr comm = Ice::initialize(initData); + Ice::CommunicatorPtr comm = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(initData)); #ifdef ICE_CPP11_MAPPING comm->stringToProxy("test:default -p 12010")->ice_ping_async(); #else diff --git a/cpp/test/Ice/adapterDeactivation/Client.cpp b/cpp/test/Ice/adapterDeactivation/Client.cpp index 35e5e8abdca..4fac6901e1a 100644 --- a/cpp/test/Ice/adapterDeactivation/Client.cpp +++ b/cpp/test/Ice/adapterDeactivation/Client.cpp @@ -38,7 +38,7 @@ main(int argc, char* argv[]) try { - communicator = Ice::initialize(argc, argv); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/adapterDeactivation/Collocated.cpp b/cpp/test/Ice/adapterDeactivation/Collocated.cpp index 67f6a550f39..0896f79771d 100644 --- a/cpp/test/Ice/adapterDeactivation/Collocated.cpp +++ b/cpp/test/Ice/adapterDeactivation/Collocated.cpp @@ -45,7 +45,7 @@ main(int argc, char* argv[]) try { - communicator = Ice::initialize(argc, argv); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/adapterDeactivation/Server.cpp b/cpp/test/Ice/adapterDeactivation/Server.cpp index b8e57302aad..ac2056d5aa5 100644 --- a/cpp/test/Ice/adapterDeactivation/Server.cpp +++ b/cpp/test/Ice/adapterDeactivation/Server.cpp @@ -40,7 +40,7 @@ main(int argc, char* argv[]) try { - communicator = Ice::initialize(argc, argv); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/admin/AllTests.cpp b/cpp/test/Ice/admin/AllTests.cpp index 09131385924..c1224aaf91c 100644 --- a/cpp/test/Ice/admin/AllTests.cpp +++ b/cpp/test/Ice/admin/AllTests.cpp @@ -190,7 +190,7 @@ allTests(const Ice::CommunicatorPtr& communicator) init.properties = Ice::createProperties(); init.properties->setProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1"); init.properties->setProperty("Ice.Admin.InstanceName", "Test"); - Ice::CommunicatorPtr com = Ice::initialize(init); + Ice::CommunicatorPtr com = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(init)); testFacets(com); com->destroy(); } @@ -203,7 +203,7 @@ allTests(const Ice::CommunicatorPtr& communicator) init.properties->setProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1"); init.properties->setProperty("Ice.Admin.InstanceName", "Test"); init.properties->setProperty("Ice.Admin.Facets", "Properties"); - Ice::CommunicatorPtr com = Ice::initialize(init); + Ice::CommunicatorPtr com = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(init)); testFacets(com, false); com->destroy(); } @@ -211,7 +211,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // // Test: Verify that the operations work correctly with the Admin object disabled. // - Ice::CommunicatorPtr com = Ice::initialize(); + Ice::CommunicatorPtr com = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize()); testFacets(com, false); com->destroy(); } @@ -222,7 +222,7 @@ allTests(const Ice::CommunicatorPtr& communicator) Ice::InitializationData init; init.properties = Ice::createProperties(); init.properties->setProperty("Ice.Admin.Enabled", "1"); - Ice::CommunicatorPtr com = Ice::initialize(init); + Ice::CommunicatorPtr com = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(init)); test(!com->getAdmin()); Ice::Identity id = com->stringToIdentity("test-admin"); @@ -251,7 +251,7 @@ allTests(const Ice::CommunicatorPtr& communicator) init.properties->setProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1"); init.properties->setProperty("Ice.Admin.InstanceName", "Test"); init.properties->setProperty("Ice.Admin.DelayCreation", "1"); - Ice::CommunicatorPtr com = Ice::initialize(init); + Ice::CommunicatorPtr com = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(init)); testFacets(com); com->getAdmin(); testFacets(com); diff --git a/cpp/test/Ice/admin/Client.cpp b/cpp/test/Ice/admin/Client.cpp index 7470609ebee..1c5300f296d 100644 --- a/cpp/test/Ice/admin/Client.cpp +++ b/cpp/test/Ice/admin/Client.cpp @@ -34,7 +34,7 @@ main(int argc, char* argv[]) try { - communicator = Ice::initialize(argc, argv); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/admin/Server.cpp b/cpp/test/Ice/admin/Server.cpp index f3cd628be4a..491d0ae125b 100644 --- a/cpp/test/Ice/admin/Server.cpp +++ b/cpp/test/Ice/admin/Server.cpp @@ -39,7 +39,7 @@ main(int argc, char* argv[]) try { - communicator = Ice::initialize(argc, argv); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/admin/TestI.cpp b/cpp/test/Ice/admin/TestI.cpp index 64ab0d191af..a9a0f2c7d28 100644 --- a/cpp/test/Ice/admin/TestI.cpp +++ b/cpp/test/Ice/admin/TestI.cpp @@ -162,7 +162,7 @@ RemoteCommunicatorFactoryI::createCommunicator(ICE_IN(Ice::PropertyDict) props, // // Initialize a new communicator. // - Ice::CommunicatorPtr communicator = Ice::initialize(init); + Ice::CommunicatorPtr communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(init)); // // Install a custom admin facet. diff --git a/cpp/test/Ice/ami/AllTests.cpp b/cpp/test/Ice/ami/AllTests.cpp index c122840bff9..da7c144caea 100644 --- a/cpp/test/Ice/ami/AllTests.cpp +++ b/cpp/test/Ice/ami/AllTests.cpp @@ -1199,7 +1199,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { Ice::InitializationData initData; initData.properties = communicator->getProperties()->clone(); - Ice::CommunicatorPtr ic = Ice::initialize(initData); + Ice::CommunicatorPtr ic = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(initData)); auto obj = ic->stringToProxy(p->ice_toString()); auto p2 = Ice::checkedCast<Test::TestIntfPrx>(obj); ic->destroy(); @@ -1256,7 +1256,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { Ice::InitializationData initData; initData.properties = communicator->getProperties()->clone(); - Ice::CommunicatorPtr ic = Ice::initialize(initData); + Ice::CommunicatorPtr ic = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(initData)); auto obj = ic->stringToProxy(p->ice_toString()); auto p2 = Ice::checkedCast<Test::TestIntfPrx>(obj); ic->destroy(); diff --git a/cpp/test/Ice/ami/Client.cpp b/cpp/test/Ice/ami/Client.cpp index 6363cc168c2..f3e0a372363 100644 --- a/cpp/test/Ice/ami/Client.cpp +++ b/cpp/test/Ice/ami/Client.cpp @@ -44,7 +44,7 @@ main(int argc, char* argv[]) // initData.properties->setProperty("Ice.TCP.SndSize", "50000"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/ami/Collocated.cpp b/cpp/test/Ice/ami/Collocated.cpp index 2ca1426f036..0b06f750503 100644 --- a/cpp/test/Ice/ami/Collocated.cpp +++ b/cpp/test/Ice/ami/Collocated.cpp @@ -55,7 +55,7 @@ main(int argc, char* argv[]) initData.properties = Ice::createProperties(argc, argv); initData.properties->setProperty("Ice.Warn.AMICallback", "0"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator, initData); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/ami/Server.cpp b/cpp/test/Ice/ami/Server.cpp index 91485d90e0e..646bfa9541b 100644 --- a/cpp/test/Ice/ami/Server.cpp +++ b/cpp/test/Ice/ami/Server.cpp @@ -64,7 +64,7 @@ main(int argc, char* argv[]) // initData.properties->setProperty("Ice.TCP.RcvSize", "50000"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/enums/Client.cpp b/cpp/test/Ice/enums/Client.cpp index 408f6519364..7885e0319be 100644 --- a/cpp/test/Ice/enums/Client.cpp +++ b/cpp/test/Ice/enums/Client.cpp @@ -36,7 +36,7 @@ main(int argc, char* argv[]) try { - communicator = Ice::initialize(argc, argv); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/enums/Server.cpp b/cpp/test/Ice/enums/Server.cpp index 9b06cae40ff..a9db3dd1f3d 100644 --- a/cpp/test/Ice/enums/Server.cpp +++ b/cpp/test/Ice/enums/Server.cpp @@ -40,7 +40,7 @@ main(int argc, char* argv[]) try { - communicator = Ice::initialize(argc, argv); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/exceptions/Client.cpp b/cpp/test/Ice/exceptions/Client.cpp index dd0dc524185..83528b28371 100644 --- a/cpp/test/Ice/exceptions/Client.cpp +++ b/cpp/test/Ice/exceptions/Client.cpp @@ -40,7 +40,7 @@ main(int argc, char* argv[]) initData.properties = Ice::createProperties(argc, argv); initData.properties->setProperty("Ice.Warn.Connections", "0"); initData.properties->setProperty("Ice.MessageSizeMax", "10"); // 10KB max - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp index a7b0f9d88ff..daa454beb09 100644 --- a/cpp/test/Ice/exceptions/Collocated.cpp +++ b/cpp/test/Ice/exceptions/Collocated.cpp @@ -46,7 +46,7 @@ main(int argc, char* argv[]) initData.properties->setProperty("Ice.MessageSizeMax", "10"); // 10KB max initData.properties->setProperty("Ice.Warn.Connections", "0"); initData.properties->setProperty("Ice.Warn.Dispatch", "0"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp index 5b956649eb7..e62bb089ab7 100644 --- a/cpp/test/Ice/exceptions/Server.cpp +++ b/cpp/test/Ice/exceptions/Server.cpp @@ -54,7 +54,7 @@ main(int argc, char* argv[]) initData.properties->setProperty("TestAdapter2.MessageSizeMax", "0"); initData.properties->setProperty("TestAdapter3.Endpoints", "default -p 12012"); initData.properties->setProperty("TestAdapter3.MessageSizeMax", "1"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/exceptions/ServerAMD.cpp b/cpp/test/Ice/exceptions/ServerAMD.cpp index 4bcc7bc89cb..8872ec6c584 100644 --- a/cpp/test/Ice/exceptions/ServerAMD.cpp +++ b/cpp/test/Ice/exceptions/ServerAMD.cpp @@ -54,7 +54,7 @@ main(int argc, char* argv[]) initData.properties->setProperty("TestAdapter2.MessageSizeMax", "0"); initData.properties->setProperty("TestAdapter3.Endpoints", "default -p 12012"); initData.properties->setProperty("TestAdapter3.MessageSizeMax", "1"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/facets/Client.cpp b/cpp/test/Ice/facets/Client.cpp index 576a56b1f3f..a63a8eefc1a 100644 --- a/cpp/test/Ice/facets/Client.cpp +++ b/cpp/test/Ice/facets/Client.cpp @@ -36,7 +36,7 @@ main(int argc, char* argv[]) try { - communicator = Ice::initialize(argc, argv); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/facets/Collocated.cpp b/cpp/test/Ice/facets/Collocated.cpp index 0b0b1a0bb0e..ebe6679bb07 100644 --- a/cpp/test/Ice/facets/Collocated.cpp +++ b/cpp/test/Ice/facets/Collocated.cpp @@ -46,7 +46,7 @@ main(int argc, char* argv[]) try { - communicator = Ice::initialize(argc, argv); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/facets/Server.cpp b/cpp/test/Ice/facets/Server.cpp index 05c08e4a257..fabdc1c7ef4 100644 --- a/cpp/test/Ice/facets/Server.cpp +++ b/cpp/test/Ice/facets/Server.cpp @@ -45,7 +45,7 @@ main(int argc, char* argv[]) try { - communicator = Ice::initialize(argc, argv); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/faultTolerance/Client.cpp b/cpp/test/Ice/faultTolerance/Client.cpp index 7eaf999fbb3..01e9021eb1c 100644 --- a/cpp/test/Ice/faultTolerance/Client.cpp +++ b/cpp/test/Ice/faultTolerance/Client.cpp @@ -75,7 +75,7 @@ main(int argc, char* argv[]) // initData.properties->setProperty("Ice.Warn.Connections", "0"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/faultTolerance/Server.cpp b/cpp/test/Ice/faultTolerance/Server.cpp index ffceefbe756..2826610b4bc 100644 --- a/cpp/test/Ice/faultTolerance/Server.cpp +++ b/cpp/test/Ice/faultTolerance/Server.cpp @@ -79,7 +79,7 @@ main(int argc, char* argv[]) initData.properties = Ice::createProperties(argc, argv); initData.properties->setProperty("Ice.ServerIdleTime", "120"); // Two minutes. - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/hash/Client.cpp b/cpp/test/Ice/hash/Client.cpp index 8431a4662b6..1e1399971de 100644 --- a/cpp/test/Ice/hash/Client.cpp +++ b/cpp/test/Ice/hash/Client.cpp @@ -44,7 +44,7 @@ int main(int argc, char** argv) id.properties->setProperty("IceSSL.Keychain", "client.keychain"); id.properties->setProperty("IceSSL.KeychainPassword", "password"); #endif - Ice::CommunicatorPtr communicator = Ice::initialize(id); + Ice::CommunicatorPtr communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(id)); for(i = 0; proxyCollisions < maxCollisions && i < maxIterations; ++i) { ostringstream os; diff --git a/cpp/test/Ice/info/Client.cpp b/cpp/test/Ice/info/Client.cpp index b29a4c124d7..ba213462775 100644 --- a/cpp/test/Ice/info/Client.cpp +++ b/cpp/test/Ice/info/Client.cpp @@ -34,7 +34,7 @@ main(int argc, char* argv[]) try { - communicator = Ice::initialize(argc, argv); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/info/Server.cpp b/cpp/test/Ice/info/Server.cpp index b58aa06935d..5a37de680ac 100644 --- a/cpp/test/Ice/info/Server.cpp +++ b/cpp/test/Ice/info/Server.cpp @@ -40,7 +40,7 @@ main(int argc, char* argv[]) { Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/inheritance/Client.cpp b/cpp/test/Ice/inheritance/Client.cpp index 9256724470f..ad2333b5f6d 100644 --- a/cpp/test/Ice/inheritance/Client.cpp +++ b/cpp/test/Ice/inheritance/Client.cpp @@ -36,7 +36,7 @@ main(int argc, char* argv[]) try { - communicator = Ice::initialize(argc, argv); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp index 5562c432c99..9f0c5acb53d 100644 --- a/cpp/test/Ice/inheritance/Collocated.cpp +++ b/cpp/test/Ice/inheritance/Collocated.cpp @@ -41,7 +41,7 @@ main(int argc, char* argv[]) try { - communicator = Ice::initialize(argc, argv); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/inheritance/Server.cpp b/cpp/test/Ice/inheritance/Server.cpp index cec439b41d5..a09e8e488cd 100644 --- a/cpp/test/Ice/inheritance/Server.cpp +++ b/cpp/test/Ice/inheritance/Server.cpp @@ -39,7 +39,7 @@ main(int argc, char* argv[]) try { - communicator = Ice::initialize(argc, argv); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/networkProxy/Client.cpp b/cpp/test/Ice/networkProxy/Client.cpp index 60c566517a3..12717629439 100644 --- a/cpp/test/Ice/networkProxy/Client.cpp +++ b/cpp/test/Ice/networkProxy/Client.cpp @@ -38,7 +38,7 @@ main(int argc, char* argv[]) { Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/networkProxy/Server.cpp b/cpp/test/Ice/networkProxy/Server.cpp index f076974c53c..304619e9e1f 100644 --- a/cpp/test/Ice/networkProxy/Server.cpp +++ b/cpp/test/Ice/networkProxy/Server.cpp @@ -58,7 +58,7 @@ main(int argc, char* argv[]) { Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/objects/Client.cpp b/cpp/test/Ice/objects/Client.cpp index cf1e60c1993..02f6d2363e2 100644 --- a/cpp/test/Ice/objects/Client.cpp +++ b/cpp/test/Ice/objects/Client.cpp @@ -141,7 +141,7 @@ main(int argc, char* argv[]) try { - communicator = Ice::initialize(argc, argv); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp index 270d5b495ea..bfe5f685f1a 100644 --- a/cpp/test/Ice/objects/Collocated.cpp +++ b/cpp/test/Ice/objects/Collocated.cpp @@ -148,7 +148,7 @@ main(int argc, char* argv[]) try { - communicator = Ice::initialize(argc, argv); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp index 428cb735336..01f5251070b 100644 --- a/cpp/test/Ice/objects/Server.cpp +++ b/cpp/test/Ice/objects/Server.cpp @@ -94,7 +94,7 @@ main(int argc, char* argv[]) try { - communicator = Ice::initialize(argc, argv); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/operations/BatchOneways.cpp b/cpp/test/Ice/operations/BatchOneways.cpp index 05e2f391dde..d8d130e6849 100644 --- a/cpp/test/Ice/operations/BatchOneways.cpp +++ b/cpp/test/Ice/operations/BatchOneways.cpp @@ -157,7 +157,7 @@ batchOneways(const Test::MyClassPrxPtr& p) #else initData.batchRequestInterceptor = interceptor; #endif - Ice::CommunicatorPtr ic = Ice::initialize(initData); + Ice::CommunicatorPtr ic = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(initData)); Test::MyClassPrxPtr batch = ICE_UNCHECKED_CAST(Test::MyClassPrx, ic->stringToProxy(p->ice_toString()))->ice_batchOneway(); diff --git a/cpp/test/Ice/operations/Client.cpp b/cpp/test/Ice/operations/Client.cpp index fea475d97df..8631d999654 100644 --- a/cpp/test/Ice/operations/Client.cpp +++ b/cpp/test/Ice/operations/Client.cpp @@ -66,7 +66,7 @@ main(int argc, char* argv[]) initData.properties->setProperty("Ice.BatchAutoFlushSize", "100"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator, initData); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp index d7efae4e203..cac36a291e3 100644 --- a/cpp/test/Ice/operations/Collocated.cpp +++ b/cpp/test/Ice/operations/Collocated.cpp @@ -50,7 +50,7 @@ main(int argc, char* argv[]) initData.properties->setProperty("Ice.BatchAutoFlushSize", "100"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator, initData); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp index 19e60a7d2df..0f099678b11 100644 --- a/cpp/test/Ice/operations/Server.cpp +++ b/cpp/test/Ice/operations/Server.cpp @@ -48,7 +48,7 @@ main(int argc, char* argv[]) // initData.properties->setProperty("Ice.Warn.Dispatch", "0"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/operations/ServerAMD.cpp b/cpp/test/Ice/operations/ServerAMD.cpp index 76f24555c2b..64fd3479220 100644 --- a/cpp/test/Ice/operations/ServerAMD.cpp +++ b/cpp/test/Ice/operations/ServerAMD.cpp @@ -42,7 +42,7 @@ main(int argc, char* argv[]) Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); initData.properties->setProperty("Ice.Warn.Dispatch", "0"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator); } diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp index 50711ad105e..a4fe76f8e7e 100644 --- a/cpp/test/Ice/operations/Twoways.cpp +++ b/cpp/test/Ice/operations/Twoways.cpp @@ -1588,7 +1588,7 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& p) initData.properties = communicator->getProperties()->clone(); initData.properties->setProperty("Ice.ImplicitContext", impls[i]); - Ice::CommunicatorPtr ic = Ice::initialize(initData); + Ice::CommunicatorPtr ic = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(initData)); Ice::Context ctx; ctx["one"] = "ONE"; diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp index f6606431f9a..13390bbd62b 100644 --- a/cpp/test/Ice/operations/TwowaysAMI.cpp +++ b/cpp/test/Ice/operations/TwowaysAMI.cpp @@ -2469,7 +2469,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& initData.properties = communicator->getProperties()->clone(); initData.properties->setProperty("Ice.ImplicitContext", impls[i]); - Ice::CommunicatorPtr ic = Ice::initialize(initData); + Ice::CommunicatorPtr ic = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(initData)); Ice::Context ctx; ctx["one"] = "ONE"; diff --git a/cpp/test/Ice/plugin/Client.cpp b/cpp/test/Ice/plugin/Client.cpp index 47f2ea339c4..be834510bc5 100644 --- a/cpp/test/Ice/plugin/Client.cpp +++ b/cpp/test/Ice/plugin/Client.cpp @@ -90,7 +90,7 @@ main(int argc, char* argv[]) cout << "testing static plugin factory... " << flush; try { - communicator = Ice::initialize(argc, argv); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv)); MyPluginPtr plugin = ICE_DYNAMIC_CAST(MyPlugin, communicator->getPluginManager()->getPlugin("Static1")); test(plugin && plugin->isInitialized()); try @@ -112,7 +112,7 @@ main(int argc, char* argv[]) Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); initData.properties->setProperty("Ice.Plugin.Static2", "1"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); MyPluginPtr plugin = ICE_DYNAMIC_CAST(MyPlugin, communicator->getPluginManager()->getPlugin("Static1")); test(plugin && plugin->isInitialized()); plugin = ICE_DYNAMIC_CAST(MyPlugin, communicator->getPluginManager()->getPlugin("Static2")); @@ -138,7 +138,7 @@ main(int argc, char* argv[]) Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); initData.properties->setProperty("Ice.Plugin.Test", pluginDir + "TestPlugin:createPlugin"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); communicator->destroy(); } catch(const Ice::Exception& ex) @@ -166,7 +166,7 @@ main(int argc, char* argv[]) Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); initData.properties->setProperty("Ice.Plugin.Test", os.str()); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); communicator->destroy(); } catch(const Ice::Exception& ex) @@ -179,7 +179,7 @@ main(int argc, char* argv[]) Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); initData.properties->setProperty("Ice.Plugin.Test", pluginDir + "TestPlugin,10:createPlugin"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); test(false); } catch(const Ice::PluginInitializationException&) @@ -190,7 +190,7 @@ main(int argc, char* argv[]) Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); initData.properties->setProperty("Ice.Plugin.Test", "TestPlugin,1.0.0:createPlugin"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); test(false); } catch(const Ice::PluginInitializationException&) @@ -203,7 +203,7 @@ main(int argc, char* argv[]) initData.properties->setProperty("Ice.Plugin.Test", pluginDir + "TestPlugin:createPluginWithArgs 'C:\\Program Files\\' --DatabasePath " "'C:\\Program Files\\Application\\db'" ); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); communicator->destroy(); } catch(const Ice::Exception& ex) @@ -220,7 +220,7 @@ main(int argc, char* argv[]) Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); initData.properties->setProperty("Ice.Plugin.Test", pluginDir + "TestPlugin:createPluginInitializeFail"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); test(false); } catch(const Ice::PluginInitializationException& ex) @@ -239,7 +239,7 @@ main(int argc, char* argv[]) initData.properties->setProperty("Ice.Plugin.PluginTwo", pluginDir + "TestPlugin:createPluginTwo"); initData.properties->setProperty("Ice.Plugin.PluginThree", pluginDir + "TestPlugin:createPluginThree"); initData.properties->setProperty("Ice.PluginLoadOrder", "PluginOne, PluginTwo"); // Exclude PluginThree - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); communicator->destroy(); } catch(const Ice::Exception& ex) @@ -259,7 +259,7 @@ main(int argc, char* argv[]) initData.properties->setProperty("Ice.Plugin.PluginThree", pluginDir + "TestPlugin:createPluginThree"); initData.properties->setProperty("Ice.PluginLoadOrder", "PluginOne, PluginTwo"); initData.properties->setProperty("Ice.InitPlugins", "0"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); Ice::PluginManagerPtr pm = communicator->getPluginManager(); test(pm->getPlugin("PluginOne")); @@ -295,7 +295,7 @@ main(int argc, char* argv[]) initData.properties->setProperty("Ice.Plugin.PluginTwoFail", pluginDir + "TestPlugin:createPluginTwoFail"); initData.properties->setProperty("Ice.Plugin.PluginThreeFail", pluginDir + "TestPlugin:createPluginThreeFail"); initData.properties->setProperty("Ice.PluginLoadOrder", "PluginOneFail, PluginTwoFail, PluginThreeFail"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); test(false); } catch(const Ice::PluginInitializationException& ex) diff --git a/cpp/test/Ice/proxy/Client.cpp b/cpp/test/Ice/proxy/Client.cpp index b436481d8ac..8c0bd35764a 100644 --- a/cpp/test/Ice/proxy/Client.cpp +++ b/cpp/test/Ice/proxy/Client.cpp @@ -40,7 +40,7 @@ main(int argc, char* argv[]) { Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator, initData); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/proxy/Collocated.cpp b/cpp/test/Ice/proxy/Collocated.cpp index 3612987454d..46cae069cae 100644 --- a/cpp/test/Ice/proxy/Collocated.cpp +++ b/cpp/test/Ice/proxy/Collocated.cpp @@ -45,7 +45,7 @@ main(int argc, char* argv[]) Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); initData.properties->setProperty("Ice.Warn.Dispatch", "0"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator, initData); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/proxy/Server.cpp b/cpp/test/Ice/proxy/Server.cpp index f9b26da3b59..7899f3f75c1 100644 --- a/cpp/test/Ice/proxy/Server.cpp +++ b/cpp/test/Ice/proxy/Server.cpp @@ -42,7 +42,7 @@ main(int argc, char* argv[]) Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); initData.properties->setProperty("Ice.Warn.Dispatch", "0"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/proxy/ServerAMD.cpp b/cpp/test/Ice/proxy/ServerAMD.cpp index a27b9df15ac..b478b9ff6ef 100644 --- a/cpp/test/Ice/proxy/ServerAMD.cpp +++ b/cpp/test/Ice/proxy/ServerAMD.cpp @@ -43,7 +43,7 @@ main(int argc, char* argv[]) initData.properties = Ice::createProperties(argc, argv); initData.properties->setProperty("Ice.Warn.Connections", "0"); initData.properties->setProperty("Ice.Warn.Dispatch", "0"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator); } diff --git a/cpp/test/Ice/slicing/objects/Client.cpp b/cpp/test/Ice/slicing/objects/Client.cpp index b4d4c1d391d..6a623ce72c3 100644 --- a/cpp/test/Ice/slicing/objects/Client.cpp +++ b/cpp/test/Ice/slicing/objects/Client.cpp @@ -45,7 +45,7 @@ main(int argc, char* argv[]) // initData.properties->setProperty("Ice.CollectObjects", "1"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/slicing/objects/Server.cpp b/cpp/test/Ice/slicing/objects/Server.cpp index 7579dc3bf96..575940a26ef 100644 --- a/cpp/test/Ice/slicing/objects/Server.cpp +++ b/cpp/test/Ice/slicing/objects/Server.cpp @@ -42,7 +42,7 @@ main(int argc, char* argv[]) try { - communicator = Ice::initialize(argc, argv); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/slicing/objects/ServerAMD.cpp b/cpp/test/Ice/slicing/objects/ServerAMD.cpp index afea23f1a24..7f175ad3943 100644 --- a/cpp/test/Ice/slicing/objects/ServerAMD.cpp +++ b/cpp/test/Ice/slicing/objects/ServerAMD.cpp @@ -42,7 +42,7 @@ main(int argc, char* argv[]) try { - communicator = Ice::initialize(argc, argv); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp index 3d46840742d..b676d21004e 100644 --- a/cpp/test/Ice/timeout/AllTests.cpp +++ b/cpp/test/Ice/timeout/AllTests.cpp @@ -326,7 +326,7 @@ allTests(const Ice::CommunicatorPtr& communicator) Ice::InitializationData initData; initData.properties = communicator->getProperties()->clone(); initData.properties->setProperty("Ice.Override.Timeout", "250"); - Ice::CommunicatorPtr comm = Ice::initialize(initData); + Ice::CommunicatorPtr comm = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(initData)); TimeoutPrxPtr to = ICE_CHECKED_CAST(TimeoutPrx, comm->stringToProxy(sref)); timeout->holdAdapter(700); try @@ -363,7 +363,7 @@ allTests(const Ice::CommunicatorPtr& communicator) Ice::InitializationData initData; initData.properties = communicator->getProperties()->clone(); initData.properties->setProperty("Ice.Override.ConnectTimeout", "250"); - Ice::CommunicatorPtr comm = Ice::initialize(initData); + Ice::CommunicatorPtr comm = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(initData)); timeout->holdAdapter(750); TimeoutPrxPtr to = ICE_UNCHECKED_CAST(TimeoutPrx, comm->stringToProxy(sref)); try @@ -415,7 +415,7 @@ allTests(const Ice::CommunicatorPtr& communicator) Ice::InitializationData initData; initData.properties = communicator->getProperties()->clone(); initData.properties->setProperty("Ice.Override.CloseTimeout", "250"); - Ice::CommunicatorPtr comm = Ice::initialize(initData); + Ice::CommunicatorPtr comm = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(initData)); Ice::ConnectionPtr connection = comm->stringToProxy(sref)->ice_getConnection(); timeout->holdAdapter(500); IceUtil::Time now = IceUtil::Time::now(); diff --git a/cpp/test/Ice/timeout/Client.cpp b/cpp/test/Ice/timeout/Client.cpp index beebbe4e0c2..e6a8ad08bab 100644 --- a/cpp/test/Ice/timeout/Client.cpp +++ b/cpp/test/Ice/timeout/Client.cpp @@ -70,7 +70,7 @@ main(int argc, char* argv[]) // initData.properties->setProperty("Ice.TCP.SndSize", "50000"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/timeout/Server.cpp b/cpp/test/Ice/timeout/Server.cpp index a11671b3c7a..f65402cc905 100644 --- a/cpp/test/Ice/timeout/Server.cpp +++ b/cpp/test/Ice/timeout/Server.cpp @@ -62,7 +62,7 @@ main(int argc, char* argv[]) // initData.properties->setProperty("Ice.TCP.RcvSize", "50000"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/udp/Client.cpp b/cpp/test/Ice/udp/Client.cpp index a9e2a0071bf..40e8ed779af 100644 --- a/cpp/test/Ice/udp/Client.cpp +++ b/cpp/test/Ice/udp/Client.cpp @@ -51,7 +51,7 @@ main(int argc, char* argv[]) initData.properties->setProperty("Ice.UDP.RcvSize", "16384"); initData.properties->setProperty("Ice.UDP.SndSize", "16384"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Ice/udp/Server.cpp b/cpp/test/Ice/udp/Server.cpp index 3409e10327a..dffc6f7b1f3 100644 --- a/cpp/test/Ice/udp/Server.cpp +++ b/cpp/test/Ice/udp/Server.cpp @@ -80,7 +80,7 @@ main(int argc, char* argv[]) initData.properties->setProperty("Ice.UDP.SndSize", "16384"); initData.properties->setProperty("Ice.UDP.RcvSize", "16384"); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(argc, argv, communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Slice/keyword/Client.cpp b/cpp/test/Slice/keyword/Client.cpp index 66ad4c054e4..72b5b838da4 100644 --- a/cpp/test/Slice/keyword/Client.cpp +++ b/cpp/test/Slice/keyword/Client.cpp @@ -194,7 +194,7 @@ main(int argc, char* argv[]) { Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(communicator); } catch(const Ice::Exception& ex) diff --git a/cpp/test/Slice/structure/Client.cpp b/cpp/test/Slice/structure/Client.cpp index 1d91a6e3029..d885eed960c 100644 --- a/cpp/test/Slice/structure/Client.cpp +++ b/cpp/test/Slice/structure/Client.cpp @@ -280,7 +280,7 @@ main(int argc, char* argv[]) { Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); - communicator = Ice::initialize(argc, argv, initData); + communicator = ICE_COMMUNICATOR_HOLDER_RELEASE(Ice::initialize(argc, argv, initData)); status = run(communicator); } catch(const Ice::Exception& ex) |