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

Fixed merge with upstream to work on gcc

Browse Source
This commit is contained in:
Colin Gaudreau
2020-08-09 21:48:07 -05:00
parent c28f03be22
commit 9baa437c3f
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parallel_hashmap/phmap.h
Vendored
+5 -7
View File
@@ -244,7 +244,7 @@ static_assert(kEmpty == -128,
"existence efficient (psignb xmm, xmm)");
static_assert(~kEmpty & ~kDeleted & kSentinel & 0x7F,
"kEmpty and kDeleted must share an unset bit that is not shared "
"by kSentinel to make the scalar test for MatchEmptyOrDeleted() "
"by kSentinel to make the scalar test for MatchEmptyOrDceleted() "
"efficient");
static_assert(kDeleted == -2,
"kDeleted must be -2 to make the implementation of "
@@ -3222,7 +3222,7 @@ private:
}
protected:
template <class K = key_type, class L = Lockable::SharedLock>
template <class K = key_type, class L = typename Lockable::SharedLock>
iterator find(const key_arg<K>& key, size_t hashval, L &mutexlock) {
Inner& inner = sets_[subidx(hashval)];
auto& set = inner.set_;
@@ -3426,16 +3426,14 @@ public:
template <class K = key_type, class F>
bool if_contains(const key_arg<K>& key, F&& f) const {
return const_cast<parallel_hash_map*>(this)->if_modify_impl<K, F, Lockable::SharedLock>(key, std::forward<F>(f));
return const_cast<parallel_hash_map*>(this)->template modify_if_impl<K, F, typename Lockable::SharedLock>(key, std::forward<F>(f));
}
template <class K = key_type, class F>
bool modify_if(const key_arg<K>& key, F&& f) {
return modify_if_impl<K, F, Lockable::UniqueLock>(key, std::forward<F>(f));
return modify_if_impl<K, F, typename Lockable::UniqueLock>(key, std::forward<F>(f));
}
template <class K = key_type, class P = Policy, K* = nullptr>
MappedReference<P> operator[](key_arg<K>&& key) {
return Policy::value(&*try_emplace(std::forward<K>(key)).first);
@@ -3453,7 +3451,7 @@ private:
static_assert(std::is_invocable<F, mapped_type&>::value);
#endif
L m;
auto it = find<K, L>(key, this->hash(key), m);
auto it = this->template find<K, L>(key, this->hash(key), m);
if (it == this->end())
return false;
std::forward<F>(f)(Policy::value(&*it));