aboutsummaryrefslogtreecommitdiff
path: root/src/main.h
diff options
context:
space:
mode:
authorEric Lombrozo <elombrozo@gmail.com>2013-06-23 18:50:06 -0700
committerEric Lombrozo <elombrozo@gmail.com>2013-06-23 19:59:35 -0700
commitf3ae51dcced8a16175426051ce888130cc2493af (patch)
tree8cb37e0d33c720ad19b0eb44d58c69e994a9d716 /src/main.h
parent5c363ed622ef8e060a3e6f6918a8b5e05798f21e (diff)
downloadbitcoin-f3ae51dcced8a16175426051ce888130cc2493af.tar.xz
Pulled ConnectBlock out of CBlock.
Diffstat (limited to 'src/main.h')
-rw-r--r--src/main.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main.h b/src/main.h
index 1822becde5..2c59644551 100644
--- a/src/main.h
+++ b/src/main.h
@@ -703,9 +703,6 @@ public:
}
- // Apply the effects of this block (with given index) on the UTXO set represented by coins
- bool ConnectBlock(CValidationState &state, CBlockIndex *pindex, CCoinsViewCache &coins, bool fJustCheck=false);
-
// Add this block to the block index, and if necessary, switch the active block chain to this
bool AddToBlockIndex(CValidationState &state, const CDiskBlockPos &pos);
@@ -732,6 +729,10 @@ bool ReadBlockFromDisk(CBlock& block, const CBlockIndex* pindex);
* of problems. Note that in any case, coins may be modified. */
bool DisconnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, CCoinsViewCache& coins, bool* pfClean = NULL);
+// Apply the effects of this block (with given index) on the UTXO set represented by coins
+bool ConnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, CCoinsViewCache& coins, bool fJustCheck = false);
+
+
class CBlockFileInfo