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.cpp | |
| 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.cpp')
| -rw-r--r-- | cpp/test/Ice/interceptor/MyObjectI.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/test/Ice/interceptor/MyObjectI.cpp b/cpp/test/Ice/interceptor/MyObjectI.cpp index c59fb3c150d..4e9c7c1f524 100644 --- a/cpp/test/Ice/interceptor/MyObjectI.cpp +++ b/cpp/test/Ice/interceptor/MyObjectI.cpp @@ -20,19 +20,19 @@ MySystemException::MySystemException(const char* file, int line) : { } -#ifndef ICE_CPP11_COMPILER -MySystemException::~MySystemException() throw() -{ -} -#endif - string MySystemException::ice_id() const { return "::MySystemException"; } -#ifndef ICE_CPP11_MAPPING +#ifdef ICE_CPP11_MAPPING +IceUtil::Exception* +MySystemException::ice_cloneImpl() const +{ + return new MySystemException(*this); +} +#else MySystemException* MySystemException::ice_clone() const { |