diff options
author | Cory Fields <cory-nospam-@coryfields.com> | 2014-12-19 15:21:29 -0500 |
---|---|---|
committer | Cory Fields <cory-nospam-@coryfields.com> | 2015-01-02 15:12:03 -0500 |
commit | a3241998e1e300e87e7c57d92c2478f67ec91db6 (patch) | |
tree | f91f21e03e2ff1d26afbde03bdbc9b29f0fbccc8 /src/walletdb.cpp | |
parent | f55c5e9749b4d010003d667421f0313e75372ddb (diff) |
namespace: remove boost namespace pollution
Diffstat (limited to 'src/walletdb.cpp')
-rw-r--r-- | src/walletdb.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/walletdb.cpp b/src/walletdb.cpp index 4fd7eb512b..668130ed69 100644 --- a/src/walletdb.cpp +++ b/src/walletdb.cpp @@ -18,7 +18,6 @@ #include <boost/scoped_ptr.hpp> #include <boost/thread.hpp> -using namespace boost; using namespace std; static uint64_t nAccountingEntryNumber = 0; @@ -865,20 +864,20 @@ bool BackupWallet(const CWallet& wallet, const string& strDest) bitdb.mapFileUseCount.erase(wallet.strWalletFile); // Copy wallet.dat - filesystem::path pathSrc = GetDataDir() / wallet.strWalletFile; - filesystem::path pathDest(strDest); - if (filesystem::is_directory(pathDest)) + boost::filesystem::path pathSrc = GetDataDir() / wallet.strWalletFile; + boost::filesystem::path pathDest(strDest); + if (boost::filesystem::is_directory(pathDest)) pathDest /= wallet.strWalletFile; try { #if BOOST_VERSION >= 104000 - filesystem::copy_file(pathSrc, pathDest, filesystem::copy_option::overwrite_if_exists); + boost::filesystem::copy_file(pathSrc, pathDest, boost::filesystem::copy_option::overwrite_if_exists); #else - filesystem::copy_file(pathSrc, pathDest); + boost::filesystem::copy_file(pathSrc, pathDest); #endif LogPrintf("copied wallet.dat to %s\n", pathDest.string()); return true; - } catch (const filesystem::filesystem_error& e) { + } catch (const boost::filesystem::filesystem_error& e) { LogPrintf("error copying wallet.dat to %s - %s\n", pathDest.string(), e.what()); return false; } |