More compilation fixes for C++20: hvec_map and copy_bitref (#4703)

* Fix another ambiguous equality. * Add missing const qualifier.
p4lang · Jun 3, 2024 · 32f2c1d · 32f2c1d
1 parent 1cbf44c
commit 32f2c1d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/bitvec.h b/lib/bitvec.h
@@ -653,7 +653,9 @@ class bitvec::copy_bitref : public bitvec::bitref<const bitvec> {
     copy_bitref(const copy_bitref &a) = default;
     copy_bitref(copy_bitref &&a) = default;
     bool operator==(const bitref &a) const { return idx == a.idx && self == a.self; }
+    bool operator==(const copy_bitref &a) const { return idx == a.idx && self == a.self; }
     bool operator!=(const bitref &a) const { return idx != a.idx || self != a.self; }
+    bool operator!=(const copy_bitref &a) const { return idx != a.idx || self != a.self; }
 };
 inline bitvec::copy_bitref bitvec::min() && { return copy_bitref(*this, ffs()); }
 inline bitvec::copy_bitref bitvec::max() && { return --copy_bitref(*this, size * bits_per_unit); }

diff --git a/lib/hvec_map.h b/lib/hvec_map.h
@@ -146,14 +146,14 @@ class hvec_map : hash_vector_base {
     bool empty() const { return inuse == 0; }
     size_t size() const { return inuse; }
     size_t max_size() const { return UINT32_MAX; }
-    bool operator==(const hvec_map &a) {
+    bool operator==(const hvec_map &a) const {
         if (inuse != a.inuse) return false;
         auto it = begin();
         for (auto &el : a)
             if (el != *it++) return false;
         return true;
     }
-    bool operator!=(const hvec_map &a) { return !(*this == a); }
+    bool operator!=(const hvec_map &a) const { return !(*this == a); }
     void clear() {
         hash_vector_base::clear();
         data.clear();