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/CtrlCHandler.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/CtrlCHandler.h')
-rw-r--r-- | cpp/include/IceUtil/CtrlCHandler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/include/IceUtil/CtrlCHandler.h b/cpp/include/IceUtil/CtrlCHandler.h index e5692d96990..0659033303a 100644 --- a/cpp/include/IceUtil/CtrlCHandler.h +++ b/cpp/include/IceUtil/CtrlCHandler.h @@ -55,16 +55,16 @@ public: CtrlCHandlerCallback getCallback() const; }; -class ICE_API CtrlCHandlerException : public Exception +class ICE_API CtrlCHandlerException : public ExceptionHelper<CtrlCHandlerException> { public: CtrlCHandlerException(const char*, int); virtual std::string ice_id() const; + #ifndef ICE_CPP11_MAPPING virtual CtrlCHandlerException* ice_clone() const; #endif - virtual void ice_throw() const; }; } |