diff options
| author | Jose <jose@zeroc.com> | 2016-01-20 10:36:51 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-01-20 10:36:51 +0100 |
| commit | 13f4fd6d3cc5a044db66d9c25319419bb4ede5fa (patch) | |
| tree | c230ae28caba40ac1f939fbedb5fd780d49fad0c /cpp/include/IceUtil/ThreadException.h | |
| parent | ICE-6861 - removing public stream API (diff) | |
| download | ice-13f4fd6d3cc5a044db66d9c25319419bb4ede5fa.tar.bz2 ice-13f4fd6d3cc5a044db66d9c25319419bb4ede5fa.tar.xz ice-13f4fd6d3cc5a044db66d9c25319419bb4ede5fa.zip | |
ice_name/ice_id fixes & simplifications.
Diffstat (limited to 'cpp/include/IceUtil/ThreadException.h')
| -rw-r--r-- | cpp/include/IceUtil/ThreadException.h | 47 |
1 files changed, 19 insertions, 28 deletions
diff --git a/cpp/include/IceUtil/ThreadException.h b/cpp/include/IceUtil/ThreadException.h index ebb827675c2..00af36c0b0d 100644 --- a/cpp/include/IceUtil/ThreadException.h +++ b/cpp/include/IceUtil/ThreadException.h @@ -21,13 +21,11 @@ class ICE_UTIL_API ThreadSyscallException : public SyscallException public: ThreadSyscallException(const char*, int, int); - virtual std::string ice_name() const; + virtual std::string ice_id() const; +#ifndef ICE_CPP11_MAPPING virtual ThreadSyscallException* ice_clone() const; +#endif virtual void ice_throw() const; - -private: - - static const char* _name; }; class ICE_UTIL_API ThreadLockedException : public Exception @@ -35,13 +33,11 @@ class ICE_UTIL_API ThreadLockedException : public Exception public: ThreadLockedException(const char*, int); - virtual std::string ice_name() const; + virtual std::string ice_id() const; +#ifndef ICE_CPP11_MAPPING virtual ThreadLockedException* ice_clone() const; +#endif virtual void ice_throw() const; - -private: - - static const char* _name; }; class ICE_UTIL_API ThreadStartedException : public Exception @@ -49,13 +45,11 @@ class ICE_UTIL_API ThreadStartedException : public Exception public: ThreadStartedException(const char*, int); - virtual std::string ice_name() const; + virtual std::string ice_id() const; +#ifndef ICE_CPP11_MAPPING virtual ThreadStartedException* ice_clone() const; +#endif virtual void ice_throw() const; - -private: - - static const char* _name; }; class ICE_UTIL_API ThreadNotStartedException : public Exception @@ -63,13 +57,11 @@ class ICE_UTIL_API ThreadNotStartedException : public Exception public: ThreadNotStartedException(const char*, int); - virtual std::string ice_name() const; + virtual std::string ice_id() const; +#ifndef ICE_CPP11_MAPPING virtual ThreadNotStartedException* ice_clone() const; +#endif virtual void ice_throw() const; - -private: - - static const char* _name; }; class ICE_UTIL_API BadThreadControlException : public Exception @@ -77,13 +69,11 @@ class ICE_UTIL_API BadThreadControlException : public Exception public: BadThreadControlException(const char*, int); - virtual std::string ice_name() const; + virtual std::string ice_id() const; +#ifndef ICE_CPP11_MAPPING virtual BadThreadControlException* ice_clone() const; +#endif virtual void ice_throw() const; - -private: - - static const char* _name; }; class ICE_UTIL_API InvalidTimeoutException : public Exception @@ -91,15 +81,16 @@ class ICE_UTIL_API InvalidTimeoutException : public Exception public: InvalidTimeoutException(const char*, int, const Time&); - virtual std::string ice_name() const; + virtual std::string ice_id() const; virtual void ice_print(std::ostream&) const; +#ifndef ICE_CPP11_MAPPING virtual InvalidTimeoutException* ice_clone() const; +#endif virtual void ice_throw() const; private: - + Time _timeout; - static const char* _name; }; } |