highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-09-12 05:32:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#35770: net: Simplify AddressPosition comparitor

Browse Source 
075e7f4218 net: Simplify `AddressPosition` comparitor (rustaceanrob)

Pull request description:

  Picked from #35713 because this appears unintentional. There were no cases where the source attempted to compare `AddressPosition` by const reference, but such a comparison is valid. This may be fixed by simplifying the comparison operator here, which also avoids copying the value.

  Found in #35713:
  ```
  <AddressPosition>' requested here
    817 |     BOOST_CHECK(addr_pos1 == addr_pos2);
        |                           ^
  /bitcoin-core/bitcoin/src/addrman.h:76:10: note: candidate function not viable: 'this' argument has type 'const AddressPosition', but method is not marked const
     76 |     bool operator==(AddressPosition other) {
  ```

ACKs for top commit:
  maflcko:
    lgtm ACK 075e7f4218
  sedited:
    Re-ACK 075e7f4218

Tree-SHA512: 4fc95026e6f9ec23757c97fc36a7fa94faf54a018727d0d2606215fc5705f3f1817607d8ff72544664cedc666914484ed490c6f75af63db1ce1a337be2e2949f
This commit is contained in:
merge-script
2026-07-22 15:12:43 +01:00
parent b8844d3df7 075e7f4218
commit 6ced9ad782
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/addrman.h
View File

@@ -16,7 +16,6 @@
#include <memory>
#include <optional>
#include <string>
#include <tuple>
#include <unordered_set>
#include <utility>
#include <vector>
@@ -73,10 +72,7 @@ struct AddressPosition {
const int bucket;
const int position;
bool operator==(AddressPosition other) {
return std::tie(tried, multiplicity, bucket, position) ==
std::tie(other.tried, other.multiplicity, other.bucket, other.position);
}
bool operator==(const AddressPosition&) const = default;
explicit AddressPosition(bool tried_in, int multiplicity_in, int bucket_in, int position_in)
: tried{tried_in}, multiplicity{multiplicity_in}, bucket{bucket_in}, position{position_in} {}
};