diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-04-06 07:54:07 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-04-06 07:54:12 +0200 |
| commit | 9ac8f6d7ddc4c949d84de5584baa813144c7fb26 (patch) | |
| tree | 7b6362d08628ea6f2c496f1937070fedfa0ed9d7 /src/wallet | |
| parent | 328aaac80d6fa28430a567230ae317362d64f897 (diff) | |
| parent | fa5eabe72117f6e3704858e8d5b2c57a120258ed (diff) | |
| download | bitcoin-9ac8f6d7ddc4c949d84de5584baa813144c7fb26.tar.xz | |
Merge #21598: refactor: Remove negative lock annotations from globals
fa5eabe72117f6e3704858e8d5b2c57a120258ed refactor: Remove negative lock annotations from globals (MarcoFalke)
Pull request description:
They only make sense for mutexes that are private members. Until cs_main is a private member the negative annotations should be replaced by excluded annotations, which are optional.
ACKs for top commit:
sipa:
utACK fa5eabe72117f6e3704858e8d5b2c57a120258ed
ajtowns:
ACK fa5eabe72117f6e3704858e8d5b2c57a120258ed
hebasto:
ACK fa5eabe72117f6e3704858e8d5b2c57a120258ed
vasild:
ACK fa5eabe72117f6e3704858e8d5b2c57a120258ed
Tree-SHA512: 06f8a200304f81533010efcc42d9f59b8c4d0ae355920c0a28efb6fa161a3e3e68f2dfffb0c009afd9c2501e6a293c6e5a419a64d718f1f4e79668ab2ab1fcdc
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 6031d36b97..192fd60dc2 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -1181,7 +1181,7 @@ public: * Obviously holding cs_main/cs_wallet when going into this call may cause * deadlock */ - void BlockUntilSyncedToCurrentChain() const EXCLUSIVE_LOCKS_REQUIRED(!::cs_main, !cs_wallet); + void BlockUntilSyncedToCurrentChain() const LOCKS_EXCLUDED(::cs_main) EXCLUSIVE_LOCKS_REQUIRED(!cs_wallet); /** set a single wallet flag */ void SetWalletFlag(uint64_t flags); |