diff options
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/main.h b/src/main.h index e519ef6551..7f8da4e898 100644 --- a/src/main.h +++ b/src/main.h @@ -699,8 +699,8 @@ public: int SetMerkleBranch(const CBlock* pblock=NULL); - int GetDepthInMainChain(int& nHeightRet) const; - int GetDepthInMainChain() const { int nHeight; return GetDepthInMainChain(nHeight); } + int GetDepthInMainChain(CBlockIndex* &pindexRet) const; + int GetDepthInMainChain() const { CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet); } bool IsInMainChain() const { return GetDepthInMainChain() > 0; } int GetBlocksToMaturity() const; bool AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs=true); @@ -762,6 +762,7 @@ public: return !(a == b); } int GetDepthInMainChain() const; + }; @@ -1267,6 +1268,11 @@ public: Set((*mi).second); } + CBlockLocator(const std::vector<uint256>& vHaveIn) + { + vHave = vHaveIn; + } + IMPLEMENT_SERIALIZE ( if (!(nType & SER_GETHASH)) |