diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2016-08-15 13:10:57 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2016-10-21 19:22:43 -0700 |
| commit | 51f278329d43398428d60f5986f8d29a2041d28d (patch) | |
| tree | bed01adf0a9ef92f90711dc08ca05934c582da6f /src/txmempool.h | |
| parent | f48211b700d171f7bcee7d3088269fdaaf1b5c13 (diff) | |
| download | bitcoin-51f278329d43398428d60f5986f8d29a2041d28d.tar.xz | |
Make removed and conflicted arguments optional to remove
Diffstat (limited to 'src/txmempool.h')
| -rw-r--r-- | src/txmempool.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/txmempool.h b/src/txmempool.h index 1763930ba0..297f5b8e5a 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -521,11 +521,11 @@ public: bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, bool fCurrentEstimate = true); bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, setEntries &setAncestors, bool fCurrentEstimate = true); - void removeRecursive(const CTransaction &tx, std::list<CTransaction>& removed); + void removeRecursive(const CTransaction &tx, std::list<CTransaction>* removed = NULL); void removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags); - void removeConflicts(const CTransaction &tx, std::list<CTransaction>& removed); + void removeConflicts(const CTransaction &tx, std::list<CTransaction>* removed = NULL); void removeForBlock(const std::vector<CTransaction>& vtx, unsigned int nBlockHeight, - std::list<CTransaction>& conflicts, bool fCurrentEstimate = true); + std::list<CTransaction>* conflicts = NULL, bool fCurrentEstimate = true); void clear(); void _clear(); //lock free bool CompareDepthAndScore(const uint256& hasha, const uint256& hashb); |