Revert "Split CMerkleTx::SetMerkleBranch"

[novacoin.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index cbec5e7..382ef1a 100644 (file)
--- 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; }