diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-02 09:56:16 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-02 09:56:33 +0200 |
| commit | 6f939c9080a3bc7d5eb5d50f1b6ed42b0f3f692c (patch) | |
| tree | 0fb472a1003c9733761e4bd6ae5542ccc8290adf /src/wallet/walletdb.cpp | |
| parent | 91990ee01dab794114b2525d72b3b581036b3570 (diff) | |
| parent | cdd79eb70fe163a92531a6f11c72bce6d228dac6 (diff) | |
| download | bitcoin-6f939c9080a3bc7d5eb5d50f1b6ed42b0f3f692c.tar.xz | |
Merge #8629: C++11: s/boost::scoped_ptr/std::unique_ptr/
cdd79eb C++11: s/boost::scoped_ptr/std::unique_ptr/ (Jorge Timón)
Diffstat (limited to 'src/wallet/walletdb.cpp')
| -rw-r--r-- | src/wallet/walletdb.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index e9b7addef8..80bfe8255d 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -18,7 +18,6 @@ #include <boost/version.hpp> #include <boost/filesystem.hpp> #include <boost/foreach.hpp> -#include <boost/scoped_ptr.hpp> #include <boost/thread.hpp> using namespace std; @@ -941,7 +940,7 @@ bool CWalletDB::Recover(CDBEnv& dbenv, const std::string& filename, bool fOnlyKe } LogPrintf("Salvage(aggressive) found %u records\n", salvagedData.size()); - boost::scoped_ptr<Db> pdbCopy(new Db(dbenv.dbenv, 0)); + std::unique_ptr<Db> pdbCopy(new Db(dbenv.dbenv, 0)); int ret = pdbCopy->open(NULL, // Txn pointer filename.c_str(), // Filename "main", // Logical db name |