From 752e06b4eb63abb8a30bb958802eaedda72d3806 Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Fri, 22 Jul 2016 17:09:25 -0400 Subject: 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 --- cpp/include/IceUtil/CtrlCHandler.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cpp/include/IceUtil/CtrlCHandler.h') 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 { 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; }; } -- cgit v1.2.3