highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-04 06:12:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses]

Browse Source
This commit is contained in:
Wladimir J. van der Laan
2012-04-15 13:27:00 +02:00
committed by Luke Dashjr
parent 678a319888
commit 8460185dec
5 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.cpp
View File

@@ -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;