diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2014-02-15 16:38:28 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2014-02-26 11:53:51 -0500 |
| commit | 93a18a3650292afbb441a47d1fa1b94aeb0164e3 (patch) | |
| tree | 36382e2077820d469fd1257ee35375a86206a878 /src/txmempool.h | |
| parent | a16ad1c0f465935d437bd9ae9875b28be49ec65b (diff) | |
Remove CWalletTx::vfSpent
Use the spent outpoint multimap to figure out which wallet transaction
outputs are unspent, instead of a vfSpent array that is saved
to disk.
Diffstat (limited to 'src/txmempool.h')
| -rw-r--r-- | src/txmempool.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/txmempool.h b/src/txmempool.h index a652c424a4..4509e95778 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -5,6 +5,8 @@ #ifndef BITCOIN_TXMEMPOOL_H #define BITCOIN_TXMEMPOOL_H +#include <list> + #include "coins.h" #include "core.h" #include "sync.h" @@ -72,8 +74,8 @@ public: void setSanityCheck(bool _fSanityCheck) { fSanityCheck = _fSanityCheck; } bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry); - bool remove(const CTransaction &tx, bool fRecursive = false); - bool removeConflicts(const CTransaction &tx); + void remove(const CTransaction &tx, std::list<CTransaction>& removed, bool fRecursive = false); + void removeConflicts(const CTransaction &tx, std::list<CTransaction>& removed); void clear(); void queryHashes(std::vector<uint256>& vtxid); void pruneSpent(const uint256& hash, CCoins &coins); |