diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-04-29 12:13:24 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-04-29 12:13:24 -0500 |
| commit | 26bfd704595323b4e4930e6b3ab1a303411e1f0e (patch) | |
| tree | fc16afa9acf7380455141fc52a1bae4e31c7231e | |
| parent | Merge pull request #6470 (diff) | |
| parent | txpool.cpp: rename var to fix for old g++ version (xenial default) (diff) | |
| download | monero-26bfd704595323b4e4930e6b3ab1a303411e1f0e.tar.xz | |
Merge pull request #6487
dd807b8 txpool.cpp: rename var to fix for old g++ version (xenial default) (sumogr)
| -rw-r--r-- | src/cryptonote_core/tx_pool.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp index a7b2e4422..469319824 100644 --- a/src/cryptonote_core/tx_pool.cpp +++ b/src/cryptonote_core/tx_pool.cpp @@ -615,8 +615,8 @@ namespace cryptonote 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*) { - const auto relay_method = meta.get_relay_method(); - if (relay_method != relay_method::block && relay_method != relay_method::fluff) + const auto tx_relay_method = meta.get_relay_method(); + if (tx_relay_method != relay_method::block && tx_relay_method != relay_method::fluff) return true; const auto i = std::find(hashes.begin(), hashes.end(), txid); if (i == hashes.end()) |