saberbud/parallel-hashmap
1
0
Fork 0
mirror of https://github.com/greg7mdp/parallel-hashmap.git synced 2026-08-30 00:50:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue #134 - compilation error in C++20 mode

Browse Source
This commit is contained in:
greg7mdp
2022-03-09 09:50:24 -05:00
parent 73be7c2ab2
commit d13c5f41b5
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parallel_hashmap/btree.h
Vendored
+8 -2
View File
@@ -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);
}
};