diff options
| author | Jeff Garzik <[email protected]> | 2014-12-31 06:48:42 -0500 |
|---|---|---|
| committer | Jeff Garzik <[email protected]> | 2014-12-31 06:48:42 -0500 |
| commit | aa5c0d34b7f4c10576914f1d07e1b823fd2f2c4b (patch) | |
| tree | 98885c7b8b0ac6d65c77b174248b9cb5cc33cc14 /src/miner.cpp | |
| parent | Merge pull request #5499 (diff) | |
| parent | Move UndoWriteToDisk() and UndoReadFromDisk() to anon namespace (diff) | |
| download | discoin-aa5c0d34b7f4c10576914f1d07e1b823fd2f2c4b.tar.xz discoin-aa5c0d34b7f4c10576914f1d07e1b823fd2f2c4b.zip | |
Merge #5111 from
branch 'core2' of git://github.com/jtimon/bitcoin into merge-5111
Diffstat (limited to 'src/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index 2133b13e6..0ac974d6e 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -279,8 +279,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) if (!CheckInputs(tx, state, view, true, MANDATORY_SCRIPT_VERIFY_FLAGS, true)) continue; - CTxUndo txundo; - UpdateCoins(tx, state, view, txundo, nHeight); + UpdateCoins(tx, state, view, nHeight); // Added pblock->vtx.push_back(tx); |