diff options
| author | Jeff Garzik <[email protected]> | 2012-04-15 11:39:15 -0700 |
|---|---|---|
| committer | Jeff Garzik <[email protected]> | 2012-04-15 11:39:15 -0700 |
| commit | 5a701eb7ea16b87b56263996ee8e98ec89e2a3d8 (patch) | |
| tree | fe8a60dc3eeb26e62cf4531a98b29ed99bee90e9 /src/main.cpp | |
| parent | Merge pull request #1084 from dooglus/validate_secret (diff) | |
| parent | fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses] (diff) | |
| download | discoin-5a701eb7ea16b87b56263996ee8e98ec89e2a3d8.tar.xz discoin-5a701eb7ea16b87b56263996ee8e98ec89e2a3d8.zip | |
Merge pull request #1104 from laanwj/2012_04_clang
Enable and fix most compilation warnings
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 a6393a5c8..f2932804e 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; |