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/AMDInterceptorI.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/AMDInterceptorI.cpp')
| -rw-r--r-- | cpp/test/Ice/interceptor/AMDInterceptorI.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/cpp/test/Ice/interceptor/AMDInterceptorI.cpp b/cpp/test/Ice/interceptor/AMDInterceptorI.cpp index bcfa1a518fd..9ae2a3a83d3 100644 --- a/cpp/test/Ice/interceptor/AMDInterceptorI.cpp +++ b/cpp/test/Ice/interceptor/AMDInterceptorI.cpp @@ -95,21 +95,12 @@ AMDInterceptorI::getActualStatus() const return _actualStatus; } -#ifdef ICE_CPP11_MAPPING -exception_ptr -AMDInterceptorI::getException() const -{ - IceUtil::Mutex::Lock lock(_mutex); - return _exception; -} -#else IceUtil::Exception* AMDInterceptorI::getException() const { IceUtil::Mutex::Lock lock(_mutex); return _exception.get(); } -#endif void AMDInterceptorI::clear() |