diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-04-02 21:35:46 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-04-02 21:35:46 -0400 |
| commit | 7edb88a3ca51ead85a8d26b86c9bfd111a88e36b (patch) | |
| tree | 11407a5b2de33133e346075d7d441598ca95673b /cpp/include/Ice/Initialize.h | |
| parent | VC90 build failure IceProxy::Ice::noExplicitContext unresolved symbol (diff) | |
| download | ice-7edb88a3ca51ead85a8d26b86c9bfd111a88e36b.tar.bz2 ice-7edb88a3ca51ead85a8d26b86c9bfd111a88e36b.tar.xz ice-7edb88a3ca51ead85a8d26b86c9bfd111a88e36b.zip | |
Small fixes to synchronize with the Ice manual
Diffstat (limited to 'cpp/include/Ice/Initialize.h')
| -rw-r--r-- | cpp/include/Ice/Initialize.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h index 6d1ff3b7bed..a56beb04e7b 100644 --- a/cpp/include/Ice/Initialize.h +++ b/cpp/include/Ice/Initialize.h @@ -205,30 +205,30 @@ public: CommunicatorHolder(const CommunicatorHolder&) = delete; CommunicatorHolder(CommunicatorHolder&&) = default; - CommunicatorHolder& operator=(CommunicatorHolder&&) = default; + CommunicatorHolder& operator=(CommunicatorHolder&&); #else // C++98 mapping // // Call initialize to create communicator with the provided args // - CommunicatorHolder(int&, const char*[], const InitializationData&, int); + CommunicatorHolder(int&, const char*[], const InitializationData& = InitializationData(), int = ICE_INT_VERSION); CommunicatorHolder(int&, char*[], const InitializationData& = InitializationData(), int = ICE_INT_VERSION); - CommunicatorHolder(int&, const char*[], const char* configFile, int = ICE_INT_VERSION); - CommunicatorHolder(int&, char*[], const char* configFile, int = ICE_INT_VERSION); + CommunicatorHolder(int&, const char*[], const char*, int = ICE_INT_VERSION); + CommunicatorHolder(int&, char*[], const char*, int = ICE_INT_VERSION); #ifdef _WIN32 CommunicatorHolder(int&, const wchar_t*[], const InitializationData& = InitializationData(), int = ICE_INT_VERSION); CommunicatorHolder(int&, wchar_t*[], const InitializationData& = InitializationData(), int = ICE_INT_VERSION); - CommunicatorHolder(int&, const wchar_t*[], const char* configFile, int = ICE_INT_VERSION); - CommunicatorHolder(int&, wchar_t*[], const char* configFile, int = ICE_INT_VERSION); + CommunicatorHolder(int&, const wchar_t*[], const char*, int = ICE_INT_VERSION); + CommunicatorHolder(int&, wchar_t*[], const char*, int = ICE_INT_VERSION); #endif - CommunicatorHolder(StringSeq& args, const InitializationData& = InitializationData(),int = ICE_INT_VERSION); - CommunicatorHolder(StringSeq& args, const char* configFile, int = ICE_INT_VERSION); + CommunicatorHolder(StringSeq&, const InitializationData& = InitializationData(),int = ICE_INT_VERSION); + CommunicatorHolder(StringSeq&, const char*, int = ICE_INT_VERSION); CommunicatorHolder(const InitializationData& = InitializationData(), int = ICE_INT_VERSION); - CommunicatorHolder(const char* configFile, int = ICE_INT_VERSION); + CommunicatorHolder(const char*, int = ICE_INT_VERSION); // // Adopt communicator @@ -245,8 +245,8 @@ public: ~CommunicatorHolder(); const CommunicatorPtr& communicator() const; - CommunicatorPtr release(); const CommunicatorPtr& operator->() const; + CommunicatorPtr release(); private: |