From a874ab5ccf7839edb445830f81591fa608d85fa6 Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Tue, 29 Nov 2016 17:51:26 -0500
Subject: remove internal tracking of mempool conflicts for reporting to wallet

---
 src/txmempool.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/txmempool.h')

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();
-- 
cgit v1.2.3