aboutsummaryrefslogtreecommitdiff
path: root/src/validation.cpp
diff options
context:
space:
mode:
authorMarcoFalke <[email protected]>2019-02-06 13:26:49 -0500
committerMarcoFalke <[email protected]>2019-02-06 13:26:52 -0500
commit5cdb82111cc128d68ba5268eb94787110ce1fe6e (patch)
tree78d1233db1adc8e2ae8e61d0f42974d91345951e /src/validation.cpp
parentMerge #15354: doc: Add missing bitcoin-wallet tool manpages (diff)
parentdoc: Add cs_main lock annotations for mapBlockIndex (diff)
downloaddiscoin-5cdb82111cc128d68ba5268eb94787110ce1fe6e.tar.xz
discoin-5cdb82111cc128d68ba5268eb94787110ce1fe6e.zip
Merge #15321: doc: Add cs_main lock annotations for mapBlockIndex
fa2a69fcb9 doc: Add cs_main lock annotations for mapBlockIndex (practicalswift) Pull request description: Marked as "doc" because it didn't change the bitcoind on my system with default configure settings for both gcc and clang. Tree-SHA512: ba203f16c1cdc834a61c65bb5fb20bbaf7d8bff0c3a1b8ef46bc1d3669092191221e26abd7e580efab2f9bd5a992dc363251f1b68c6cd68f8204d62675868cf1
Diffstat (limited to 'src/validation.cpp')
-rw-r--r--src/validation.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/validation.cpp b/src/validation.cpp
index de9c0d96d..dbdc1afb3 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -152,7 +152,7 @@ private:
public:
CChain chainActive;
- BlockMap mapBlockIndex;
+ BlockMap mapBlockIndex GUARDED_BY(cs_main);
std::multimap<CBlockIndex*, CBlockIndex*> mapBlocksUnlinked;
CBlockIndex *pindexBestInvalid = nullptr;