aboutsummaryrefslogtreecommitdiff
path: root/src/txmempool.h
diff options
context:
space:
mode:
authorAlex Morcos <morcos@chaincode.com>2016-11-29 17:15:12 -0500
committerAlex Morcos <morcos@chaincode.com>2016-12-05 13:41:25 -0500
commitbf663f8e93454fdc7c77e298586cefbb4488ee4c (patch)
tree182fbaf198dd64cf6287eb151d5bd34931c1e5be /src/txmempool.h
parent7d5d44969b4ab46a5146a46b4ed1ed7704d71c63 (diff)
remove external usage of mempool conflict tracking
Diffstat (limited to 'src/txmempool.h')
-rw-r--r--src/txmempool.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/txmempool.h b/src/txmempool.h
index 23fe5a7abe..2f40981455 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -531,7 +531,7 @@ public:
void removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags);
void removeConflicts(const CTransaction &tx, std::vector<CTransactionRef>* removed = NULL);
void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight,
- std::vector<CTransactionRef>* conflicts = NULL, bool fCurrentEstimate = true);
+ bool fCurrentEstimate = true);
void clear();
void _clear(); //lock free
bool CompareDepthAndScore(const uint256& hasha, const uint256& hashb);