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>::value, int> = 0> - void merge(btree_container &src) { // NOLINT + void merge(btree_container &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>::value, int> = 0> - void merge(btree_container &&src) { + void merge(btree_container &&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)