Merge 3515612e06 into merged_master (Bitcoin PR #15473)

This commit is contained in:
Andrew Poelstra 2020-10-27 22:59:58 +00:00
commit eef55250a7
10 changed files with 85 additions and 38 deletions

View file

@ -809,7 +809,7 @@ std::vector<CTxMemPool::indexed_transaction_set::const_iterator> CTxMemPool::Get
return iters;
}
void CTxMemPool::queryHashes(std::vector<uint256>& vtxid)
void CTxMemPool::queryHashes(std::vector<uint256>& vtxid) const
{
LOCK(cs);
auto iters = GetSortedDepthAndScore();