diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2016-11-10 17:26:00 -0800 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2016-11-19 17:51:09 -0800 |
| commit | 1662b437b33b7ec5a1723f6ae6187d3bdd06f593 (patch) | |
| tree | 00b734409ca0ff817c36c000deae676df3cf16e2 /src/txmempool.h | |
| parent | da60506fc80f6a78f1b271a9a53b956b49b37234 (diff) | |
| download | bitcoin-1662b437b33b7ec5a1723f6ae6187d3bdd06f593.tar.xz | |
Make CBlock::vtx a vector of shared_ptr<CTransaction>
Diffstat (limited to 'src/txmempool.h')
| -rw-r--r-- | src/txmempool.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/txmempool.h b/src/txmempool.h index 9b0ca4655e..6952cc9006 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -530,7 +530,7 @@ public: 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::vector<std::shared_ptr<const CTransaction>>* removed = NULL); - void removeForBlock(const std::vector<CTransaction>& vtx, unsigned int nBlockHeight, + void removeForBlock(const std::vector<std::shared_ptr<const CTransaction>>& vtx, unsigned int nBlockHeight, std::vector<std::shared_ptr<const CTransaction>>* conflicts = NULL, bool fCurrentEstimate = true); void clear(); void _clear(); //lock free |