Merge pull request #6487

dd807b8 txpool.cpp: rename var to fix for old g++ version (xenial default) (sumogr)
This commit is contained in:
luigi1111 2020-04-29 12:13:24 -05:00
commit 26bfd70459
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 2 additions and 2 deletions

View File

@ -615,8 +615,8 @@ namespace cryptonote
CRITICAL_REGION_LOCAL1(m_blockchain); CRITICAL_REGION_LOCAL1(m_blockchain);
m_blockchain.for_all_txpool_txes([this, &hashes, &txes](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata*) { m_blockchain.for_all_txpool_txes([this, &hashes, &txes](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata*) {
const auto relay_method = meta.get_relay_method(); const auto tx_relay_method = meta.get_relay_method();
if (relay_method != relay_method::block && relay_method != relay_method::fluff) if (tx_relay_method != relay_method::block && tx_relay_method != relay_method::fluff)
return true; return true;
const auto i = std::find(hashes.begin(), hashes.end(), txid); const auto i = std::find(hashes.begin(), hashes.end(), txid);
if (i == hashes.end()) if (i == hashes.end())