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/test/Ice/interceptor/MyObjectI.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/test/Ice/interceptor/MyObjectI.h')
| -rw-r--r-- | cpp/test/Ice/interceptor/MyObjectI.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/cpp/test/Ice/interceptor/MyObjectI.h b/cpp/test/Ice/interceptor/MyObjectI.h index dadd3cddebf..d75af0fce3b 100644 --- a/cpp/test/Ice/interceptor/MyObjectI.h +++ b/cpp/test/Ice/interceptor/MyObjectI.h @@ -18,15 +18,19 @@ public: MySystemException(const char*, int); -#ifndef ICE_CPP11_COMPILER - virtual ~MySystemException() throw(); -#endif - virtual std::string ice_id() const; + #ifndef ICE_CPP11_MAPPING virtual MySystemException* ice_clone() const; #endif virtual void ice_throw() const; + +#ifdef ICE_CPP11_MAPPING + +protected: + + virtual IceUtil::Exception* ice_cloneImpl() const; +#endif }; class MyObjectI : public Test::MyObject |