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/Ice/ConnectionI.h | |
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/Ice/ConnectionI.h')
-rw-r--r-- | cpp/src/Ice/ConnectionI.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h index c181452d99b..e58bc7b0eb6 100644 --- a/cpp/src/Ice/ConnectionI.h +++ b/cpp/src/Ice/ConnectionI.h @@ -33,7 +33,7 @@ #include <Ice/ConnectionAsync.h> #include <deque> -#include <memory> +#include <IceUtil/UniquePtr.h> namespace IceInternal { @@ -319,7 +319,7 @@ private: std::map<Int, IceInternal::OutgoingAsyncPtr> _asyncRequests; std::map<Int, IceInternal::OutgoingAsyncPtr>::iterator _asyncRequestsHint; - std::auto_ptr<LocalException> _exception; + IceUtil::UniquePtr<LocalException> _exception; const bool _batchAutoFlush; IceInternal::BasicStream _batchStream; |