X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Fmain.h;h=cbec5e7b485096588b615765ddca0cc91fdd8edb;hp=cb7650cdf2b8c11e71bd68a6011f745df0d52f84;hb=40530c08006088e6f610063f1c49428aa0b272f6;hpb=2d6690cc0c0e2525996856c392566133d1b2de50

diff --git a/src/main.h b/src/main.h
index cb7650c..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);
+    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; }