diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-09-22 14:14:26 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-09-22 14:18:54 +0200 |
| commit | 3cdae61aa22cd6eca43ac4e25c2ea0c1941fbd0d (patch) | |
| tree | d80fb00f5b5a74cabe1e7d27fb6dea7e76a9c28f /src/wallet.h | |
| parent | 565da68ed0362bbb3ab3f70146f0b150528cc393 (diff) | |
| parent | 4b0deb3b2df5882061ae6c44947eda831420cd5e (diff) | |
| download | bitcoin-3cdae61aa22cd6eca43ac4e25c2ea0c1941fbd0d.tar.xz | |
Merge pull request #4787
4b0deb3 Clean up CMerkleTx::SetMerkleBranch. (Daniel Kraft)
Diffstat (limited to 'src/wallet.h')
| -rw-r--r-- | src/wallet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet.h b/src/wallet.h index 3461446b8b..fde87a8a2f 100644 --- 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) |