Merge pull request #4787

4b0deb3 Clean up CMerkleTx::SetMerkleBranch. (Daniel Kraft)
2014-09-22 14:14:26 +02:00
parent 565da68ed0 4b0deb3b2d
commit 3cdae61aa2
2 changed files with 19 additions and 33 deletions
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -504,7 +504,7 @@ public:
        READWRITE(nIndex);
    }

-    int SetMerkleBranch(const CBlock* pblock=NULL);
+    int SetMerkleBranch(const CBlock& block);

    // Return depth of transaction in blockchain:
    // -1  : not in blockchain, and not in memory pool (conflicted transaction)