fix bitcoin#8574 backport

PastaPastaPasta · Jan 27, 2019 · 7f403c5 · 7f403c5
1 parent 1dac7d8
commit 7f403c5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
@@ -211,7 +211,7 @@ bool CDB::Recover(const std::string& filename, void *callbackDataIn, bool (*reco
         {
             CDataStream ssKey(row.first, SER_DISK, CLIENT_VERSION);
             CDataStream ssValue(row.second, SER_DISK, CLIENT_VERSION);
-            string strType, strErr;
+            std::string strType, strErr;
             if (!(*recoverKVcallback)(callbackDataIn, ssKey, ssValue))
                 continue;
         }
@@ -604,7 +604,7 @@ bool CDB::PeriodicFlush(std::string strFile)
     {
         // Don't do this if any databases are in use
         int nRefCount = 0;
-        map<string, int>::iterator mi = bitdb.mapFileUseCount.begin();
+        std::map<std::string, int>::iterator mi = bitdb.mapFileUseCount.begin();
         while (mi != bitdb.mapFileUseCount.end())
         {
             nRefCount += (*mi).second;
@@ -614,7 +614,7 @@ bool CDB::PeriodicFlush(std::string strFile)
         if (nRefCount == 0)
         {
             boost::this_thread::interruption_point();
-            map<string, int>::iterator mi = bitdb.mapFileUseCount.find(strFile);
+            std::map<std::string, int>::iterator mi = bitdb.mapFileUseCount.find(strFile);
             if (mi != bitdb.mapFileUseCount.end())
             {
                 LogPrint("db", "Flushing %s\n", strFile);