diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-04 23:48:01 +0200 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-04 23:49:35 +0200 |
commit | af9c3b0cffa4449f1254da3073aef77bafddf9cd (patch) | |
tree | 7f76c41b2a5556b9836bde8691ee4af9c3030dae /src/checkpoints.cpp | |
parent | b4cd0975fbc93063473a4d9a09e2b2fe3c4ad489 (diff) | |
parent | 1e4f87f5a13e34a457b537e9d13a212e6c5b754f (diff) | |
download | bitcoin-af9c3b0cffa4449f1254da3073aef77bafddf9cd.tar.xz |
Merge pull request #4838
1e4f87f Use memcmp for uint256 equality/inequality (Pieter Wuille)
8a41e1e Use boost::unordered_map for mapBlockIndex (Pieter Wuille)
145d5be Introduce BlockMap type for mapBlockIndex (Pieter Wuille)
a0dbe43 checkpoints.cpp depends on main, it can use mapBlockIndex directly (Pieter Wuille)
Diffstat (limited to 'src/checkpoints.cpp')
-rw-r--r-- | src/checkpoints.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 717f0b90fe..c41deea7ce 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -146,7 +146,7 @@ namespace Checkpoints { return checkpoints.rbegin()->first; } - CBlockIndex* GetLastCheckpoint(const std::map<uint256, CBlockIndex*>& mapBlockIndex) + CBlockIndex* GetLastCheckpoint() { if (!fEnabled) return NULL; @@ -156,7 +156,7 @@ namespace Checkpoints { BOOST_REVERSE_FOREACH(const MapCheckpoints::value_type& i, checkpoints) { const uint256& hash = i.second; - std::map<uint256, CBlockIndex*>::const_iterator t = mapBlockIndex.find(hash); + BlockMap::const_iterator t = mapBlockIndex.find(hash); if (t != mapBlockIndex.end()) return t->second; } |