From d13c5f41b59dfe0f1089f0ac517b78b0f71a62c0 Mon Sep 17 00:00:00 2001
From: greg7mdp <greg7mdp@gmail.com>
Date: Wed, 9 Mar 2022 09:50:24 -0500
Subject: [PATCH] Fix issue #134 - compilation error in C++20 mode

---
 parallel_hashmap/btree.h        | 10 ++++++++--
 tests/parallel_hash_set_test.cc |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/parallel_hashmap/btree.h b/parallel_hashmap/btree.h
index e72b4d2..5f34f11 100644
--- a/parallel_hashmap/btree.h
+++ b/parallel_hashmap/btree.h
@@ -1528,6 +1528,12 @@ namespace priv {
         bool operator!=(const const_iterator &x) const {
             return node != x.node || position != x.position;
         }
+        bool operator==(const iterator &x) const {
+            return node == x.node && position == x.position;
+        }
+        bool operator!=(const iterator &x) const {
+            return node != x.node || position != x.position;
+        }
 
         // Accessors for the key/value the iterator is pointing at.
         reference operator*() const {
@@ -3784,7 +3790,7 @@ namespace priv {
                     std::is_same<typename params_type::is_map_container,
                                  typename T::params_type::is_map_container>>::value,
                 int> = 0>
-            void merge(btree_container<T> &src) {  // NOLINT
+        void merge(btree_container<T> &src) {  // NOLINT
             insert(std::make_move_iterator(src.begin()),
                    std::make_move_iterator(src.end()));
             src.clear();
@@ -3799,7 +3805,7 @@ namespace priv {
                     std::is_same<typename params_type::is_map_container,
                                  typename T::params_type::is_map_container>>::value,
                 int> = 0>
-            void merge(btree_container<T> &&src) {
+        void merge(btree_container<T> &&src) {
             merge(src);
         }
     };
diff --git a/tests/parallel_hash_set_test.cc b/tests/parallel_hash_set_test.cc
index 5083e48..ed600c6 100644
--- a/tests/parallel_hash_set_test.cc
+++ b/tests/parallel_hash_set_test.cc
@@ -120,7 +120,7 @@ TEST(THIS_TEST_NAME, EmplaceSingle) {
     // --------------------
     // test emplace_single
     // --------------------
-    Set m = { {1}, {11} };
+    Set m = { 1, 11 };
  
     // emplace_single insert a value if not already present, else removes it
     for (int i=0; i<12; ++i)