summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/ServerCache.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/IceGrid/ServerCache.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/IceGrid/ServerCache.cpp')
-rw-r--r--cpp/src/IceGrid/ServerCache.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp
index c7b3835eeb0..7d0ceeb69cf 100644
--- a/cpp/src/IceGrid/ServerCache.cpp
+++ b/cpp/src/IceGrid/ServerCache.cpp
@@ -275,7 +275,7 @@ ServerEntry::update(const ServerInfo& info)
{
Lock sync(*this);
- auto_ptr<ServerInfo> descriptor(new ServerInfo());
+ IceUtil::UniquePtr<ServerInfo> descriptor(new ServerInfo());
*descriptor = info;
_updated = true;