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/LocatorInfo.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/LocatorInfo.h')
| -rw-r--r-- | cpp/src/Ice/LocatorInfo.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/LocatorInfo.h b/cpp/src/Ice/LocatorInfo.h index 266756fc0db..b3252e01453 100644 --- a/cpp/src/Ice/LocatorInfo.h +++ b/cpp/src/Ice/LocatorInfo.h @@ -20,7 +20,7 @@ #include <Ice/EndpointIF.h> #include <Ice/PropertiesF.h> -#include <memory> +#include <IceUtil/UniquePtr.h> namespace IceInternal { @@ -130,7 +130,7 @@ public: bool _sent; bool _response; Ice::ObjectPrx _proxy; - std::auto_ptr<Ice::Exception> _exception; + IceUtil::UniquePtr<Ice::Exception> _exception; }; typedef IceUtil::Handle<Request> RequestPtr; |