diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-02 20:17:41 -0500 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-02 20:17:41 -0500 |
| commit | 882e00e2159ce5e12170c7c1811236a039d8abfa (patch) | |
| tree | 03e522bdc55f5a11e43c3c2cb2891895ecb704a9 /src/main.h | |
| parent | c13d50d8617678c8696b1f33549ed9cc3a0b554e (diff) | |
| parent | c11e2b8679e13f739a58faf2a3439d4aaed24364 (diff) | |
| download | bitcoin-882e00e2159ce5e12170c7c1811236a039d8abfa.tar.xz | |
Merge branch '0.4.x' into 0.5.0.x
Conflicts:
src/main.cpp
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.h b/src/main.h index 3870cee864..47394ff8e9 100644 --- a/src/main.h +++ b/src/main.h @@ -637,7 +637,8 @@ public: bool ReadFromDisk(COutPoint prevout); bool DisconnectInputs(CTxDB& txdb); bool ConnectInputs(CTxDB& txdb, std::map<uint256, CTxIndex>& mapTestPool, CDiskTxPos posThisTx, - CBlockIndex* pindexBlock, int64& nFees, bool fBlock, bool fMiner, int64 nMinFee=0); + CBlockIndex* pindexBlock, int64& nFees, bool fBlock, bool fMiner, int64 nMinFee, + bool& fInvalid); bool ClientConnectInputs(); bool CheckTransaction() const; bool AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs=true, bool* pfMissingInputs=NULL); |