diff options
author | Bernard Normier <bernard@zeroc.com> | 2015-12-11 18:00:31 -0500 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2015-12-11 18:00:31 -0500 |
commit | a2dfe3a7cd457d0d4b38399ab0aca4f0335fb0c8 (patch) | |
tree | 979e304b6beb03bdceed36bee74edd5cabfa9add /cpp/src/Ice/CommunicatorI.h | |
parent | Fix Windows C++ tests build (diff) | |
download | ice-a2dfe3a7cd457d0d4b38399ab0aca4f0335fb0c8.tar.bz2 ice-a2dfe3a7cd457d0d4b38399ab0aca4f0335fb0c8.tar.xz ice-a2dfe3a7cd457d0d4b38399ab0aca4f0335fb0c8.zip |
Updated Ice::CommunicationHolder and simplified tests
Diffstat (limited to 'cpp/src/Ice/CommunicatorI.h')
-rw-r--r-- | cpp/src/Ice/CommunicatorI.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h index 72245853234..277d573b04b 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 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 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 ::IceInternal::InstancePtr IceInternal::getInstance(const ::Ice::CommunicatorPtr&); friend ICE_API ::IceUtil::TimerPtr IceInternal::getInstanceTimer(const ::Ice::CommunicatorPtr&); |