aboutsummaryrefslogtreecommitdiff
path: root/src/wallet.h
diff options
context:
space:
mode:
authorDaniel Kraft <d@domob.eu>2014-08-29 20:24:16 +0200
committerDaniel Kraft <d@domob.eu>2014-08-30 18:00:55 +0200
commit4b0deb3b2df5882061ae6c44947eda831420cd5e (patch)
tree0f92881b989b537c4bf79edbd35b472ea7b3be7f /src/wallet.h
parent9f3d47677973cb894fdbb437b9b322e2062a1bf1 (diff)
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.
Diffstat (limited to 'src/wallet.h')
-rw-r--r--src/wallet.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet.h b/src/wallet.h
index 544b4f5bfb..3becc396c1 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)