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

update erase() to return an iterator, and README as well

Browse Source
This commit is contained in:
greg
2019-03-29 20:34:15 -04:00
parent bad9609978
commit 1e595ed7b5
2 changed files with 168 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parallel_hashmap/phmap.h
Vendored
+17 -13
View File
@@ -1440,6 +1440,9 @@ public:
return 1;
}
iterator erase(const_iterator cit) { return erase(cit.inner_); }
// Erases the element pointed to by `it`. Unlike `std::unordered_set::erase`,
// this method returns void to reduce algorithmic complexity to O(1). In
// order to erase while iterating across a map, use the following idiom (which
@@ -1447,21 +1450,21 @@ public:
//
// for (auto it = m.begin(), end = m.end(); it != end;) {
// if (<pred>) {
// m.erase(it++);
// m._erase(it++);
// } else {
// ++it;
// }
// }
void erase(const_iterator cit) { erase(cit.inner_); }
// This overload is necessary because otherwise erase<K>(const K&) would be
// a better match if non-const iterator is passed as an argument.
void erase(iterator it) {
void _erase(iterator it) {
assert(it != end());
PolicyTraits::destroy(&alloc_ref(), it.slot_);
erase_meta_only(it);
}
// This overload is necessary because otherwise erase<K>(const K&) would be
// a better match if non-const iterator is passed as an argument.
iterator erase(iterator it) { _erase(it++); return it; }
iterator erase(const_iterator first, const_iterator last) {
while (first != last) {
erase(first++);
@@ -2951,6 +2954,9 @@ public:
return 1;
}
// --------------------------------------------------------------------
iterator erase(const_iterator cit) { return erase(cit.iter_); }
// Erases the element pointed to by `it`. Unlike `std::unordered_set::erase`,
// this method returns void to reduce algorithmic complexity to O(1). In
// order to erase while iterating across a map, use the following idiom (which
@@ -2958,23 +2964,21 @@ public:
//
// for (auto it = m.begin(), end = m.end(); it != end;) {
// if (<pred>) {
// m.erase(it++);
// m._erase(it++);
// } else {
// ++it;
// }
// }
// --------------------------------------------------------------------
void erase(const_iterator cit) {
erase(cit.iter_);
void _erase(iterator it) {
assert(it.inner_ != nullptr);
it.inner_->set_._erase(it.it_);
}
// This overload is necessary because otherwise erase<K>(const K&) would be
// a better match if non-const iterator is passed as an argument.
// --------------------------------------------------------------------
void erase(iterator it) {
assert(it.inner_ != nullptr);
it.inner_->set_.erase(it.it_);
}
iterator erase(iterator it) { _erase(it++); return it; }
iterator erase(const_iterator first, const_iterator last) {
while (first != last) {