diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-23 18:43:37 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-23 18:45:26 +0200 |
| commit | d2464dfee928cdd4194516e9bc8b541c22972ab9 (patch) | |
| tree | 19021d0c8d5bf2cd672b4e127e93e489606e98e7 /src/wallet | |
| parent | d946e9a848b82873881cd48267041081be8424c5 (diff) | |
| parent | a794284e61988a226ea39327449be9906a1b5abd (diff) | |
| download | bitcoin-d2464dfee928cdd4194516e9bc8b541c22972ab9.tar.xz | |
Merge pull request #6287
a794284 locking: add a quick example of GUARDED_BY (Cory Fields)
2b890dd locking: fix a few small issues uncovered by -Wthread-safety (Cory Fields)
cd27bba locking: teach Clang's -Wthread-safety to cope with our scoped lock macros (Cory Fields)
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 8d88933878..f6ca8cbb76 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -476,7 +476,6 @@ UniValue listaddressgroupings(const UniValue& params, bool fHelp) addressInfo.push_back(CBitcoinAddress(address).ToString()); addressInfo.push_back(ValueFromAmount(balances[address])); { - LOCK(pwalletMain->cs_wallet); if (pwalletMain->mapAddressBook.find(CBitcoinAddress(address).Get()) != pwalletMain->mapAddressBook.end()) addressInfo.push_back(pwalletMain->mapAddressBook.find(CBitcoinAddress(address).Get())->second.name); } |