From 4b0deb3b2df5882061ae6c44947eda831420cd5e Mon Sep 17 00:00:00 2001 From: Daniel Kraft Date: Fri, 29 Aug 2014 20:24:16 +0200 Subject: Clean up CMerkleTx::SetMerkleBranch. The case SetMerkleBranch(NULL) was never actually used, and thus the involved code (loading the block from disk) can be removed and the implementation simplified. --- src/wallet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/wallet.h') diff --git a/src/wallet.h b/src/wallet.h index 544b4f5bf..3becc396c 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -500,7 +500,7 @@ public: ) - 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) -- cgit v1.2.3