diff options
| author | Jose <jose@zeroc.com> | 2016-01-11 17:21:46 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-01-11 17:21:46 +0100 |
| commit | 6fece3700ac31712b6d8892108a17e01cb2614be (patch) | |
| tree | 9cdcfed91e78c9bd226881ee594f58a09fba38a6 /cpp/src/Ice/ConnectionI.cpp | |
| parent | Fix Ice/location test failures with C++11 (diff) | |
| download | ice-6fece3700ac31712b6d8892108a17e01cb2614be.tar.bz2 ice-6fece3700ac31712b6d8892108a17e01cb2614be.tar.xz ice-6fece3700ac31712b6d8892108a17e01cb2614be.zip | |
Add ICE_RESET_EXCEPTION macro to simplify C++ builds
Diffstat (limited to 'cpp/src/Ice/ConnectionI.cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectionI.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index d3b54bfa386..cb7fcfc5d3f 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -2384,11 +2384,7 @@ Ice::ConnectionI::setState(State state, const LocalException& ex) // If we are in closed state, an exception must be set. // assert(_state != StateClosed); -#ifdef ICE_CPP11_MAPPING - _exception = ex.ice_clone(); -#else - _exception.reset(ex.ice_clone()); -#endif + ICE_RESET_EXCEPTION(_exception, ex.ice_clone()); // // We don't warn if we are not validated. // |