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/IceGrid/ServerCache.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/IceGrid/ServerCache.h')
| -rw-r--r-- | cpp/src/IceGrid/ServerCache.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/ServerCache.h b/cpp/src/IceGrid/ServerCache.h index c7986a9813e..7795a7358cf 100644 --- a/cpp/src/IceGrid/ServerCache.h +++ b/cpp/src/IceGrid/ServerCache.h @@ -86,9 +86,9 @@ private: ServerCache& _cache; const std::string _id; - std::auto_ptr<ServerInfo> _loaded; - std::auto_ptr<ServerInfo> _load; - std::auto_ptr<ServerInfo> _destroy; + IceUtil::UniquePtr<ServerInfo> _loaded; + IceUtil::UniquePtr<ServerInfo> _load; + IceUtil::UniquePtr<ServerInfo> _destroy; ServerPrx _proxy; AdapterPrxDict _adapters; @@ -97,7 +97,7 @@ private: bool _synchronizing; bool _updated; - std::auto_ptr<Ice::Exception> _exception; + IceUtil::UniquePtr<Ice::Exception> _exception; std::vector<SynchronizationCallbackPtr> _callbacks; SessionIPtr _session; |