diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2017-06-13 17:55:46 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2017-06-13 18:05:58 -0700 |
| commit | 1ad3d4e1261f4a444d982a1470c257c78233bda3 (patch) | |
| tree | 228e740c5251770dc6f32a99c8be792b1ea5eda8 /src/policy/rbf.cpp | |
| parent | fbf5d3ba15161f71cbb84a51c1703c22b651e8a9 (diff) | |
| parent | 1238f13cf6ccf1177b66df735f360c61ae1dc20b (diff) | |
| download | bitcoin-1ad3d4e1261f4a444d982a1470c257c78233bda3.tar.xz | |
Merge #10502: scripted-diff: Remove BOOST_FOREACH, Q_FOREACH and PAIRTYPE
1238f13cf scripted-diff: Remove PAIRTYPE (Jorge Timón)
18dc3c396 scripted-diff: Remove Q_FOREACH (Jorge Timón)
7c00c2672 scripted-diff: Fully remove BOOST_FOREACH (Jorge Timón)
a5410ac5e Small preparations for Q_FOREACH, PAIRTYPE and #include <boost/foreach.hpp> removal (Jorge Timón)
Tree-SHA512: d3ab4a173366402e7dcef31608977b757d4aa07abbbad2ee1bcbcfa311e994a4552f24e5a55272cb22c2dcf89a4b0495e02e9d9aceae4b08c0bab668f20e324c
Diffstat (limited to 'src/policy/rbf.cpp')
| -rw-r--r-- | src/policy/rbf.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/policy/rbf.cpp b/src/policy/rbf.cpp index d9b47e71bb..755ef83c9a 100644 --- a/src/policy/rbf.cpp +++ b/src/policy/rbf.cpp @@ -6,7 +6,7 @@ bool SignalsOptInRBF(const CTransaction &tx) { - BOOST_FOREACH(const CTxIn &txin, tx.vin) { + for (const CTxIn &txin : tx.vin) { if (txin.nSequence < std::numeric_limits<unsigned int>::max()-1) { return true; } @@ -38,7 +38,7 @@ RBFTransactionState IsRBFOptIn(const CTransaction &tx, CTxMemPool &pool) CTxMemPoolEntry entry = *pool.mapTx.find(tx.GetHash()); pool.CalculateMemPoolAncestors(entry, setAncestors, noLimit, noLimit, noLimit, noLimit, dummy, false); - BOOST_FOREACH(CTxMemPool::txiter it, setAncestors) { + for (CTxMemPool::txiter it : setAncestors) { if (SignalsOptInRBF(it->GetTx())) { return RBF_TRANSACTIONSTATE_REPLACEABLE_BIP125; } |