diff options
| author | Pieter Wuille <[email protected]> | 2016-03-05 06:49:47 +0100 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2016-03-05 06:56:33 +0100 |
| commit | 9f33dba05c01ecc5c56eb1284ab7d64d42f55171 (patch) | |
| tree | 031673d6ff0595a9c4478772f3454d59ffa010d5 /src/txmempool.cpp | |
| parent | Merge #7455: [travis] Exit early when check-doc.py fails (diff) | |
| parent | Add tags to mempool's mapTx indices (diff) | |
| download | discoin-9f33dba05c01ecc5c56eb1284ab7d64d42f55171.tar.xz discoin-9f33dba05c01ecc5c56eb1284ab7d64d42f55171.zip | |
Merge #7539: Add tags to mempool's mapTx indices
086da92 Add tags to mempool's mapTx indices (Suhas Daftuar)
Diffstat (limited to 'src/txmempool.cpp')
| -rw-r--r-- | src/txmempool.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 0b0f32e40..eee6cbf85 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -859,9 +859,9 @@ void CTxMemPool::RemoveStaged(setEntries &stage) { int CTxMemPool::Expire(int64_t time) { LOCK(cs); - indexed_transaction_set::nth_index<2>::type::iterator it = mapTx.get<2>().begin(); + indexed_transaction_set::index<entry_time>::type::iterator it = mapTx.get<entry_time>().begin(); setEntries toremove; - while (it != mapTx.get<2>().end() && it->GetTime() < time) { + while (it != mapTx.get<entry_time>().end() && it->GetTime() < time) { toremove.insert(mapTx.project<0>(it)); it++; } @@ -957,7 +957,7 @@ void CTxMemPool::TrimToSize(size_t sizelimit, std::vector<uint256>* pvNoSpendsRe unsigned nTxnRemoved = 0; CFeeRate maxFeeRateRemoved(0); while (DynamicMemoryUsage() > sizelimit) { - indexed_transaction_set::nth_index<1>::type::iterator it = mapTx.get<1>().begin(); + indexed_transaction_set::index<descendant_score>::type::iterator it = mapTx.get<descendant_score>().begin(); // We set the new mempool min fee to the feerate of the removed set, plus the // "minimum reasonable fee rate" (ie some value under which we consider txn |