diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-04-15 13:27:00 +0200 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-15 19:43:41 -0400 |
| commit | 8460185dec74383b1e49500683cfc7aa9ceba554 (patch) | |
| tree | 1b8bde4e173a0340c3c2940bdabbb48797c87fad /src/main.cpp | |
| parent | 678a319888f88cf5bae2312afc3ba73533c0f901 (diff) | |
| download | bitcoin-8460185dec74383b1e49500683cfc7aa9ceba554.tar.xz | |
fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses]
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp index 4316d242f9..059dd3db9e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1149,14 +1149,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; + } } + } // P2SH didn't become active until Apr 1 2012 (Feb 15 on testnet) int64 nEvalSwitchTime = fTestNet ? 1329264000 : 1333238400; |