summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Reference.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2012-10-05 16:31:52 -0400
committerBernard Normier <bernard@zeroc.com>2012-10-05 16:31:52 -0400
commit0d20d608543547fd2a3abcc08210fb7910773e3d (patch)
tree33b4acb74e574e4cbced30693448fcd3808c8d9d /cpp/src/Ice/Reference.cpp
parentFixed ICE-4741 and minor add-in issues (diff)
downloadice-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/Reference.cpp')
-rw-r--r--cpp/src/Ice/Reference.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index 69df87b2924..3822d8afee6 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -1674,7 +1674,7 @@ IceInternal::RoutableReference::createConnection(const vector<EndpointIPtr>& all
// connection for one of the endpoints.
//
- auto_ptr<LocalException> exception;
+ IceUtil::UniquePtr<LocalException> exception;
vector<EndpointIPtr> endpoint;
endpoint.push_back(0);
@@ -1832,7 +1832,7 @@ IceInternal::RoutableReference::createConnection(const vector<EndpointIPtr>& all
const vector<EndpointIPtr> _endpoints;
const GetConnectionCallbackPtr _callback;
size_t _i;
- std::auto_ptr<Ice::LocalException> _exception;
+ IceUtil::UniquePtr<Ice::LocalException> _exception;
};
//