diff options
author | Bernard Normier <bernard@zeroc.com> | 2012-10-05 16:31:52 -0400 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2012-10-05 16:31:52 -0400 |
commit | 0d20d608543547fd2a3abcc08210fb7910773e3d (patch) | |
tree | 33b4acb74e574e4cbced30693448fcd3808c8d9d /cpp/src/Glacier2Lib/SessionHelper.cpp | |
parent | Fixed ICE-4741 and minor add-in issues (diff) | |
download | ice-0d20d608543547fd2a3abcc08210fb7910773e3d.tar.bz2 ice-0d20d608543547fd2a3abcc08210fb7910773e3d.tar.xz ice-0d20d608543547fd2a3abcc08210fb7910773e3d.zip |
Port to gcc and clang in c++11 mode:
- for GCC, replaced most std::auto_ptr usage by a new IceUtil::UniquePtr
- for clang, added ICE_NOEXCEPT and ICE_NOEXCEPT_FALSE for a few dtors in Freeze
Diffstat (limited to 'cpp/src/Glacier2Lib/SessionHelper.cpp')
-rw-r--r-- | cpp/src/Glacier2Lib/SessionHelper.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp index 31cfc92fbee..3080fe5c47f 100644 --- a/cpp/src/Glacier2Lib/SessionHelper.cpp +++ b/cpp/src/Glacier2Lib/SessionHelper.cpp @@ -10,13 +10,10 @@ #include <IceUtil/DisableWarnings.h> #include <Glacier2/SessionHelper.h> -#include <IceUtil/UUID.h> -#include <IceUtil/CountDownLatch.h> - +#include <IceUtil/IceUtil.h> #include <Ice/Ice.h> #include <algorithm> // required by max -#include <memory> // required by auto_ptr using namespace std; @@ -525,7 +522,7 @@ private: const Glacier2::SessionCallbackPtr _callback; const Glacier2::SessionHelperPtr _session; - std::auto_ptr<Ice::Exception> _ex; + IceUtil::UniquePtr<Ice::Exception> _ex; }; class CreatedCommunicator : public Ice::DispatcherCall |