From bf663f8e93454fdc7c77e298586cefbb4488ee4c Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Tue, 29 Nov 2016 17:15:12 -0500
Subject: remove external usage of mempool conflict tracking

---
 src/txmempool.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/txmempool.h')

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