X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmain.h;h=cbec5e7b485096588b615765ddca0cc91fdd8edb;hb=2404891de8ac5b357d0abde90f2e286a3153fdef;hp=df49707e1458b2a96d3b03bb954c7f7fe40900d1;hpb=8982b69aabfefd65e8f3d859018228998f523cae;p=novacoin.git

diff --git a/src/main.h b/src/main.h
index df49707..cbec5e7 100644
--- a/src/main.h
+++ b/src/main.h
@@ -113,7 +113,7 @@ bool LoadBlockIndex(bool fAllowNew=true);
 void PrintBlockTree();
 CBlockIndex* FindBlockByHeight(int nHeight);
 bool ProcessMessages(CNode* pfrom);
-bool SendMessages(CNode* pto, bool fSendTrickle);
+bool SendMessages(CNode* pto);
 bool LoadExternalBlockFile(FILE* fileIn);
 
 // Run an instance of the script checking thread
@@ -794,7 +794,8 @@ public:
     )
 
 
-    int SetMerkleBranch(const CBlock* pblock=NULL);
+    int SetMerkleBranch();
+    int SetMerkleBranch(const CBlock &block);
     int GetDepthInMainChain(CBlockIndex* &pindexRet) const;
     int GetDepthInMainChain() const { CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet); }
     bool IsInMainChain() const { return GetDepthInMainChain() > 0; }