diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-08-31 16:20:29 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-08-31 16:40:29 +0200 |
| commit | abc677c9a98aece686670562e9bd1a42e295ae83 (patch) | |
| tree | 75de181d0c2b55c23ed2b34a35a4f0e8661024a9 /src/wallet/rpcwallet.cpp | |
| parent | 5cac8b123e7e76ab0bf41d23a46816345c9926f0 (diff) | |
| parent | b175cb755bd2b62a19dbf27daf07ae5354f9a079 (diff) | |
| download | bitcoin-abc677c9a98aece686670562e9bd1a42e295ae83.tar.xz | |
Merge #8191: Do not shadow variables in src/wallet
b175cb7 Do not shadow variables. (Pavel JanÃk)
Diffstat (limited to 'src/wallet/rpcwallet.cpp')
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 9629ec1db6..0ba6706baf 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -1176,10 +1176,10 @@ UniValue ListReceived(const UniValue& params, bool fByAccounts) if (fByAccounts) { - tallyitem& item = mapAccountTally[strAccount]; - item.nAmount += nAmount; - item.nConf = min(item.nConf, nConf); - item.fIsWatchonly = fIsWatchonly; + tallyitem& _item = mapAccountTally[strAccount]; + _item.nAmount += nAmount; + _item.nConf = min(_item.nConf, nConf); + _item.fIsWatchonly = fIsWatchonly; } else { @@ -1195,9 +1195,9 @@ UniValue ListReceived(const UniValue& params, bool fByAccounts) UniValue transactions(UniValue::VARR); if (it != mapTally.end()) { - BOOST_FOREACH(const uint256& item, (*it).second.txids) + BOOST_FOREACH(const uint256& _item, (*it).second.txids) { - transactions.push_back(item.GetHex()); + transactions.push_back(_item.GetHex()); } } obj.push_back(Pair("txids", transactions)); |