From 4100499db4e886d7a9ad2dcf4007ce44fb2c1a62 Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Mon, 15 Aug 2016 12:57:10 +0200 Subject: Return shared_ptr from mempool removes --- src/txmempool.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/txmempool.h') diff --git a/src/txmempool.h b/src/txmempool.h index 297f5b8e5a..1a7e054e37 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -6,7 +6,6 @@ #ifndef BITCOIN_TXMEMPOOL_H #define BITCOIN_TXMEMPOOL_H -#include #include #include @@ -521,11 +520,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* removed = NULL); + void removeRecursive(const CTransaction &tx, std::vector>* removed = NULL); void removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags); - void removeConflicts(const CTransaction &tx, std::list* removed = NULL); + void removeConflicts(const CTransaction &tx, std::vector>* removed = NULL); void removeForBlock(const std::vector& vtx, unsigned int nBlockHeight, - std::list* conflicts = NULL, bool fCurrentEstimate = true); + std::vector>* conflicts = NULL, bool fCurrentEstimate = true); void clear(); void _clear(); //lock free bool CompareDepthAndScore(const uint256& hasha, const uint256& hashb); -- cgit v1.2.3