X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmain.h;h=382ef1a33bd04b5caf015727182f24eda8058298;hb=89d4073d0a6545330af16bb8b2352881b6f55cf5;hp=cbec5e7b485096588b615765ddca0cc91fdd8edb;hpb=40530c08006088e6f610063f1c49428aa0b272f6;p=novacoin.git 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; }