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/Freeze/SharedDbEnv.cpp | |
| 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/Freeze/SharedDbEnv.cpp')
| -rw-r--r-- | cpp/src/Freeze/SharedDbEnv.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/Freeze/SharedDbEnv.cpp b/cpp/src/Freeze/SharedDbEnv.cpp index d17e61faf36..42c7ed4baf3 100644 --- a/cpp/src/Freeze/SharedDbEnv.cpp +++ b/cpp/src/Freeze/SharedDbEnv.cpp @@ -23,7 +23,6 @@ #include <Ice/StringConverter.h> #include <cstdlib> -#include <memory> using namespace std; @@ -149,7 +148,7 @@ Freeze::SharedDbEnv::get(const CommunicatorPtr& communicator, const string& envN // // MapKey not found, let's create and open a new DbEnv // - auto_ptr<SharedDbEnv> result(new SharedDbEnv(envName, communicator, env)); + IceUtil::UniquePtr<SharedDbEnv> result(new SharedDbEnv(envName, communicator, env)); // // Insert it into the map @@ -246,7 +245,7 @@ Freeze::SharedDbEnv::getSharedMapDb(const string& dbName, ConnectionIPtr insertConnection = new ConnectionI(this); - auto_ptr<MapDb> result(new MapDb(insertConnection, dbName, key, value, + IceUtil::UniquePtr<MapDb> result(new MapDb(insertConnection, dbName, key, value, keyCompare, indices, createDb)); // |