Merge #8554: trivial: remove unused variable

laanwj · laanwj · commit 37e77c106cb5 · 2016-08-22T10:36:37.000+02:00
4207630 trivial: remove unused variable (Daniel Kraft)
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3534,7 +3534,6 @@ CWalletKey::CWalletKey(int64_t nExpires)
 int CMerkleTx::SetMerkleBranch(const CBlockIndex* pindex, int posInBlock)
 {
     AssertLockHeld(cs_main);
-    CBlock blockTmp;
 
     // Update the tx's hashBlock
     hashBlock = pindex->GetBlockHash();

Original file line number	Diff line number	Diff line change
`@@ -3534,7 +3534,6 @@ CWalletKey::CWalletKey(int64_t nExpires)`
`3534`	`3534`	`int CMerkleTx::SetMerkleBranch(const CBlockIndex* pindex, int posInBlock)`
`3535`	`3535`	`{`
`3536`	`3536`	`AssertLockHeld(cs_main);`
`3537`		`- CBlock blockTmp;`
`3538`	`3537`
`3539`	`3538`	`// Update the tx's hashBlock`
`3540`	`3539`	`hashBlock = pindex->GetBlockHash();`