diff options
| author | Alex Morcos <morcos@chaincode.com> | 2016-11-29 17:51:26 -0500 |
|---|---|---|
| committer | Alex Morcos <morcos@chaincode.com> | 2016-12-05 13:41:25 -0500 |
| commit | a874ab5ccf7839edb445830f81591fa608d85fa6 (patch) | |
| tree | b041fb44aea7e908b057a9ced215c3ad39941db9 /src/txmempool.h | |
| parent | bf663f8e93454fdc7c77e298586cefbb4488ee4c (diff) | |
| download | bitcoin-a874ab5ccf7839edb445830f81591fa608d85fa6.tar.xz | |
remove internal tracking of mempool conflicts for reporting to wallet
Diffstat (limited to 'src/txmempool.h')
| -rw-r--r-- | src/txmempool.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/txmempool.h b/src/txmempool.h index 2f40981455..8a935391de 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -527,9 +527,9 @@ 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::vector<CTransactionRef>* removed = NULL); + void removeRecursive(const CTransaction &tx); void removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags); - void removeConflicts(const CTransaction &tx, std::vector<CTransactionRef>* removed = NULL); + void removeConflicts(const CTransaction &tx); void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight, bool fCurrentEstimate = true); void clear(); |