diff options
author | jtimon <jtimon@blockstream.io> | 2014-09-03 02:52:01 +0200 |
---|---|---|
committer | jtimon <jtimon@blockstream.io> | 2014-09-08 22:14:24 +0200 |
commit | 6db83db3eb96809da3e680464b152f82785e38e6 (patch) | |
tree | e74fd80fe789c3550d862d088e2d6b86be547e14 /src/main.h | |
parent | eecd3c0fb0625b036f68a7830dda8edde21fcb90 (diff) |
Decouple CChain from mapBlockIndex
Diffstat (limited to 'src/main.h')
-rw-r--r-- | src/main.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.h b/src/main.h index 30cccab2f1..dbc20783bb 100644 --- a/src/main.h +++ b/src/main.h @@ -953,13 +953,13 @@ public: /** Return a CBlockLocator that refers to a block in this chain (by default the tip). */ CBlockLocator GetLocator(const CBlockIndex *pindex = NULL) const; - /** Find the last common block between this chain and a locator. */ - CBlockIndex *FindFork(const CBlockLocator &locator) const; - /** Find the last common block between this chain and a block index entry. */ const CBlockIndex *FindFork(const CBlockIndex *pindex) const; }; +/** Find the last common block between the parameter chain and a locator. */ +CBlockIndex* FindForkInGlobalIndex(const CChain& chain, const CBlockLocator& locator); + /** The currently-connected chain of blocks. */ extern CChain chainActive; |