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

rename function name which conflicts with a #define macro from /usr/include/X11/Xos.h

Browse Source
This commit is contained in:
greg
2020-03-27 19:35:00 -04:00
parent 23e651c2d5
commit b791e794ac
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parallel_hashmap/phmap.h
Vendored
+4 -4
View File
@@ -95,7 +95,7 @@ public:
offset_ &= mask_;
}
// 0-based probe index. The i-th probe in the probe sequence.
size_t index() const { return index_; }
size_t getindex() const { return index_; }
private:
size_t mask_;
@@ -1908,7 +1908,7 @@ private:
}
if (PHMAP_PREDICT_TRUE(g.MatchEmpty())) return false;
seq.next();
assert(seq.index() < capacity_ && "full table!");
assert(seq.getindex() < capacity_ && "full table!");
}
return false;
}
@@ -1938,9 +1938,9 @@ private:
Group g{ctrl_ + seq.offset()};
auto mask = g.MatchEmptyOrDeleted();
if (mask) {
return {seq.offset((size_t)mask.LowestBitSet()), seq.index()};
return {seq.offset((size_t)mask.LowestBitSet()), seq.getindex()};
}
assert(seq.index() < capacity_ && "full table!");
assert(seq.getindex() < capacity_ && "full table!");
seq.next();
}
}