aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2012-04-15 13:27:00 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2012-04-15 13:40:14 +0200
commitda7bbd9dfdb8914977fc254b0c9b1bb3025726c8 (patch)
tree3d7bc058a06e178b92431212d1948df4c6dda0c8 /src/main.cpp
parent6642ffb761cc04c990510d8a5e89714e003abb77 (diff)
downloadbitcoin-da7bbd9dfdb8914977fc254b0c9b1bb3025726c8.tar.xz
fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses]
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp
index a6393a5c83..f2932804e3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1261,14 +1261,18 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex)
// This rule applies to all blocks whose timestamp is after March 15, 2012, 0:00 UTC.
// On testnet it is enabled as of februari 20, 2012, 0:00 UTC.
if (pindex->nTime > 1331769600 || (fTestNet && pindex->nTime > 1329696000))
+ {
BOOST_FOREACH(CTransaction& tx, vtx)
{
CTxIndex txindexOld;
if (txdb.ReadTxIndex(tx.GetHash(), txindexOld))
+ {
BOOST_FOREACH(CDiskTxPos &pos, txindexOld.vSpent)
if (pos.IsNull())
return false;
+ }
}
+ }
// BIP16 didn't become active until Apr 1 2012 (Feb 15 on testnet)
int64 nBIP16SwitchTime = fTestNet ? 1329264000 : 1333238400;