diff options
| author | Jose <jose@zeroc.com> | 2017-04-28 17:39:34 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-04-28 17:39:34 +0200 |
| commit | 03ada3f46b2ba7dc38f3e0f293cd64e4ce6049c1 (patch) | |
| tree | 43c0b8cdc06de03862a7a9d503dea024b57308b0 /cpp/include | |
| parent | Fixed ICE-7843 - Check NSStreamStatusAtEnd in iOS transports (diff) | |
| download | ice-03ada3f46b2ba7dc38f3e0f293cd64e4ce6049c1.tar.bz2 ice-03ada3f46b2ba7dc38f3e0f293cd64e4ce6049c1.tar.xz ice-03ada3f46b2ba7dc38f3e0f293cd64e4ce6049c1.zip | |
Add operator bool() to CommunicatorHolder
Diffstat (limited to 'cpp/include')
| -rw-r--r-- | cpp/include/Ice/Initialize.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h index 587af6172c5..83e36938dc4 100644 --- a/cpp/include/Ice/Initialize.h +++ b/cpp/include/Ice/Initialize.h @@ -215,6 +215,8 @@ public: CommunicatorHolder(CommunicatorHolder&&) = default; CommunicatorHolder& operator=(CommunicatorHolder&&); + explicit operator bool() const; + #else // C++98 mapping // @@ -225,12 +227,12 @@ public: CommunicatorHolder(int&, const char*[], const char*, int = ICE_INT_VERSION); CommunicatorHolder(int&, char*[], const char*, int = ICE_INT_VERSION); -#ifdef _WIN32 +# 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*, int = ICE_INT_VERSION); CommunicatorHolder(int&, wchar_t*[], const char*, int = ICE_INT_VERSION); -#endif +# endif explicit CommunicatorHolder(StringSeq&, const InitializationData& = InitializationData(), int = ICE_INT_VERSION); CommunicatorHolder(StringSeq&, const char*, int = ICE_INT_VERSION); @@ -244,6 +246,8 @@ public: explicit CommunicatorHolder(const CommunicatorPtr&); CommunicatorHolder& operator=(const CommunicatorPtr&); + operator bool() const; + // // Required for successful copy-initialization, but not // defined as it should always be elided by compiler |