aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/walletdb.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2016-08-31 16:20:29 +0200
committerWladimir J. van der Laan <[email protected]>2016-08-31 16:40:29 +0200
commitabc677c9a98aece686670562e9bd1a42e295ae83 (patch)
tree75de181d0c2b55c23ed2b34a35a4f0e8661024a9 /src/wallet/walletdb.cpp
parentMerge #8291: [util] CopyrightHolders: Check for untranslated substitution (diff)
parentDo not shadow variables. (diff)
downloaddiscoin-abc677c9a98aece686670562e9bd1a42e295ae83.tar.xz
discoin-abc677c9a98aece686670562e9bd1a42e295ae83.zip
Merge #8191: Do not shadow variables in src/wallet
b175cb7 Do not shadow variables. (Pavel Janík)
Diffstat (limited to 'src/wallet/walletdb.cpp')
-rw-r--r--src/wallet/walletdb.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 9de0671ea..e9b7addef 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -887,8 +887,8 @@ void ThreadFlushWalletDB(const string& strFile)
if (nRefCount == 0)
{
boost::this_thread::interruption_point();
- map<string, int>::iterator mi = bitdb.mapFileUseCount.find(strFile);
- if (mi != bitdb.mapFileUseCount.end())
+ map<string, int>::iterator _mi = bitdb.mapFileUseCount.find(strFile);
+ if (_mi != bitdb.mapFileUseCount.end())
{
LogPrint("db", "Flushing %s\n", strFile);
nLastFlushed = nWalletDBUpdated;
@@ -898,7 +898,7 @@ void ThreadFlushWalletDB(const string& strFile)
bitdb.CloseDb(strFile);
bitdb.CheckpointLSN(strFile);
- bitdb.mapFileUseCount.erase(mi++);
+ bitdb.mapFileUseCount.erase(_mi++);
LogPrint("db", "Flushed %s %dms\n", strFile, GetTimeMillis() - nStart);
}
}