diff options
author | Bernard Normier <bernard@zeroc.com> | 2016-07-22 17:09:25 -0400 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2016-07-22 17:09:25 -0400 |
commit | 752e06b4eb63abb8a30bb958802eaedda72d3806 (patch) | |
tree | 7c2348544d202c310a55a62629abc4025daa03a5 /cpp/include/IceUtil/ThreadException.h | |
parent | Disable VS 2015 update 3 optimizer (diff) | |
download | ice-752e06b4eb63abb8a30bb958802eaedda72d3806.tar.bz2 ice-752e06b4eb63abb8a30bb958802eaedda72d3806.tar.xz ice-752e06b4eb63abb8a30bb958802eaedda72d3806.zip |
Added ICE_BUILDING_SRC to make builds
Ice::Dispatcher and Ice::LocalObject are now hidden with C++11
Reworked C++11 exception ice_clone, added ExceptionHelper
+ other C++ cleanups
Diffstat (limited to 'cpp/include/IceUtil/ThreadException.h')
-rw-r--r-- | cpp/include/IceUtil/ThreadException.h | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/cpp/include/IceUtil/ThreadException.h b/cpp/include/IceUtil/ThreadException.h index 8f380206d5c..2e0756938eb 100644 --- a/cpp/include/IceUtil/ThreadException.h +++ b/cpp/include/IceUtil/ThreadException.h @@ -16,77 +16,78 @@ namespace IceUtil { -class ICE_API ThreadSyscallException : public SyscallException +class ICE_API ThreadSyscallException : public SyscallExceptionHelper<ThreadSyscallException> { public: ThreadSyscallException(const char*, int, int); virtual std::string ice_id() const; + #ifndef ICE_CPP11_MAPPING virtual ThreadSyscallException* ice_clone() const; #endif - virtual void ice_throw() const; }; -class ICE_API ThreadLockedException : public Exception +class ICE_API ThreadLockedException : public ExceptionHelper<ThreadLockedException> { public: ThreadLockedException(const char*, int); virtual std::string ice_id() const; + #ifndef ICE_CPP11_MAPPING virtual ThreadLockedException* ice_clone() const; #endif - virtual void ice_throw() const; }; -class ICE_API ThreadStartedException : public Exception +class ICE_API ThreadStartedException : public ExceptionHelper<ThreadStartedException> { public: ThreadStartedException(const char*, int); virtual std::string ice_id() const; + #ifndef ICE_CPP11_MAPPING virtual ThreadStartedException* ice_clone() const; #endif - virtual void ice_throw() const; + }; -class ICE_API ThreadNotStartedException : public Exception +class ICE_API ThreadNotStartedException : public ExceptionHelper<ThreadNotStartedException> { public: ThreadNotStartedException(const char*, int); virtual std::string ice_id() const; + #ifndef ICE_CPP11_MAPPING virtual ThreadNotStartedException* ice_clone() const; #endif - virtual void ice_throw() const; }; -class ICE_API BadThreadControlException : public Exception +class ICE_API BadThreadControlException : public ExceptionHelper<BadThreadControlException> { public: BadThreadControlException(const char*, int); virtual std::string ice_id() const; + #ifndef ICE_CPP11_MAPPING virtual BadThreadControlException* ice_clone() const; #endif - virtual void ice_throw() const; }; -class ICE_API InvalidTimeoutException : public Exception +class ICE_API InvalidTimeoutException : public ExceptionHelper<InvalidTimeoutException> { public: InvalidTimeoutException(const char*, int, const Time&); 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: |