X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Fmain.h;h=382ef1a33bd04b5caf015727182f24eda8058298;hp=cbec5e7b485096588b615765ddca0cc91fdd8edb;hb=refs%2Ftags%2Fnvc-v0.5.8;hpb=05df71c9c292877e7469884227fd3ba84d02908b diff --git a/src/main.h b/src/main.h index cbec5e7..382ef1a 100644 --- a/src/main.h +++ b/src/main.h @@ -794,8 +794,7 @@ public: ) - int SetMerkleBranch(); - int SetMerkleBranch(const CBlock &block); + int SetMerkleBranch(const CBlock* pblock=NULL); int GetDepthInMainChain(CBlockIndex* &pindexRet) const; int GetDepthInMainChain() const { CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet); } bool IsInMainChain() const { return GetDepthInMainChain() > 0; }