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/include | |
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/include')
-rw-r--r-- | cpp/test/include/TestCommon.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cpp/test/include/TestCommon.h b/cpp/test/include/TestCommon.h index 7ec0469f25b..e8605f5c1b4 100644 --- a/cpp/test/include/TestCommon.h +++ b/cpp/test/include/TestCommon.h @@ -161,7 +161,12 @@ public: return "::TestFailedException"; } -#ifndef ICE_CPP11_MAPPING +#ifdef ICE_CPP11_MAPPING + virtual IceUtil::Exception* ice_cloneImpl() const + { + return new TestFailedException(*this); + } +#else virtual TestFailedException* ice_clone() const { return new TestFailedException(*this); |