diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-03-20 19:03:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-20 19:03:44 +0100 |
| commit | aec489e80254bcf5d3300e60df568e5c83a11779 (patch) | |
| tree | 0a355c75b688a1716768b676c604fb14eb0656a8 /vespalib | |
| parent | 59bb8cda4c4bc8aa06b1a1a771a5324d8b36d50e (diff) | |
Revert "Since the most important aspect our use of hash maps/sets is for spee…"
Diffstat (limited to 'vespalib')
| -rw-r--r-- | vespalib/src/vespa/vespalib/stllike/hash_map.h | 2 | ||||
| -rw-r--r-- | vespalib/src/vespa/vespalib/stllike/hash_set.h | 2 | ||||
| -rw-r--r-- | vespalib/src/vespa/vespalib/stllike/hash_set.hpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vespalib/src/vespa/vespalib/stllike/hash_map.h b/vespalib/src/vespa/vespalib/stllike/hash_map.h index 29a5ef01a9f..3dc5de65285 100644 --- a/vespalib/src/vespa/vespalib/stllike/hash_map.h +++ b/vespalib/src/vespa/vespalib/stllike/hash_map.h @@ -7,7 +7,7 @@ namespace vespalib { -template< typename K, typename V, typename H = vespalib::hash<K>, typename EQ = std::equal_to<>, typename M=hashtable_base::and_modulator > +template< typename K, typename V, typename H = vespalib::hash<K>, typename EQ = std::equal_to<>, typename M=hashtable_base::prime_modulator > class hash_map { public: diff --git a/vespalib/src/vespa/vespalib/stllike/hash_set.h b/vespalib/src/vespa/vespalib/stllike/hash_set.h index 0c3f2dcb220..08288086bf3 100644 --- a/vespalib/src/vespa/vespalib/stllike/hash_set.h +++ b/vespalib/src/vespa/vespalib/stllike/hash_set.h @@ -8,7 +8,7 @@ namespace vespalib { -template< typename K, typename H = vespalib::hash<K>, typename EQ = std::equal_to<>, typename M=hashtable_base::and_modulator> +template< typename K, typename H = vespalib::hash<K>, typename EQ = std::equal_to<>, typename M=hashtable_base::prime_modulator> class hash_set { private: diff --git a/vespalib/src/vespa/vespalib/stllike/hash_set.hpp b/vespalib/src/vespa/vespalib/stllike/hash_set.hpp index 3e48e62f2c7..19114798806 100644 --- a/vespalib/src/vespa/vespalib/stllike/hash_set.hpp +++ b/vespalib/src/vespa/vespalib/stllike/hash_set.hpp @@ -85,11 +85,11 @@ hash_set<K, H, EQ, M>::insert(K &&value) { #define VESPALIB_HASH_SET_INSTANTIATE(K) \ template class vespalib::hash_set<K>; \ - template class vespalib::hashtable<K, K, vespalib::hash<K>, std::equal_to<>, vespalib::Identity, vespalib::hashtable_base::and_modulator>; \ + template class vespalib::hashtable<K, K, vespalib::hash<K>, std::equal_to<>, vespalib::Identity>; \ template class vespalib::Array<vespalib::hash_node<K>>; #define VESPALIB_HASH_SET_INSTANTIATE_H(K, H) \ template class vespalib::hash_set<K, H>; \ - template class vespalib::hashtable<K, K, H, std::equal_to<>, vespalib::Identity, vespalib::hashtable_base::and_modulator>; \ + template class vespalib::hashtable<K, K, H, std::equal_to<>, vespalib::Identity>; \ template class vespalib::Array<vespalib::hash_node<K>>; |