diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2016-08-15 12:57:10 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2016-10-21 19:22:43 -0700 |
| commit | 4100499db4e886d7a9ad2dcf4007ce44fb2c1a62 (patch) | |
| tree | 0d0ee0c1cf38fa43e84f5689ff5905e580f0e02a /src/txmempool.h | |
| parent | 51f278329d43398428d60f5986f8d29a2041d28d (diff) | |
| download | bitcoin-4100499db4e886d7a9ad2dcf4007ce44fb2c1a62.tar.xz | |
Return shared_ptr<CTransaction> from mempool removes
Diffstat (limited to 'src/txmempool.h')
| -rw-r--r-- | src/txmempool.h | 7 |
1 files changed, 3 insertions, 4 deletions
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 <list> #include <memory> #include <set> @@ -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<CTransaction>* removed = NULL); + void removeRecursive(const CTransaction &tx, std::vector<std::shared_ptr<const CTransaction>>* removed = NULL); void removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags); - void removeConflicts(const CTransaction &tx, std::list<CTransaction>* removed = NULL); + void removeConflicts(const CTransaction &tx, std::vector<std::shared_ptr<const CTransaction>>* removed = NULL); void removeForBlock(const std::vector<CTransaction>& vtx, unsigned int nBlockHeight, - std::list<CTransaction>* conflicts = NULL, bool fCurrentEstimate = true); + std::vector<std::shared_ptr<const CTransaction>>* conflicts = NULL, bool fCurrentEstimate = true); void clear(); void _clear(); //lock free bool CompareDepthAndScore(const uint256& hasha, const uint256& hashb); |