diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-03-20 16:51:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-20 16:51:16 +0100 |
| commit | 08ef563613dd267cde78882b3caceaad5f69507d (patch) | |
| tree | e23ef265acc84a4b256b446731fc1d07c7cc0749 /vespalib/src | |
| parent | fc8d9ab3a254d031dd3a21f63e171abfd5955ab8 (diff) | |
| parent | c28ba15ab3cc9d08e748ddbbbb4e0f0ddd9652e3 (diff) | |
Merge pull request #12646 from vespa-engine/balder/make-default-hashing-use-2N-and-instead-of-prime-mod
Since the most important aspect our use of hash maps/sets is for spee…
Diffstat (limited to 'vespalib/src')
| -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 3dc5de65285..29a5ef01a9f 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::prime_modulator > +template< typename K, typename V, typename H = vespalib::hash<K>, typename EQ = std::equal_to<>, typename M=hashtable_base::and_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 08288086bf3..0c3f2dcb220 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::prime_modulator> +template< typename K, typename H = vespalib::hash<K>, typename EQ = std::equal_to<>, typename M=hashtable_base::and_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 19114798806..3e48e62f2c7 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>; \ + template class vespalib::hashtable<K, K, vespalib::hash<K>, std::equal_to<>, vespalib::Identity, vespalib::hashtable_base::and_modulator>; \ 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>; \ + template class vespalib::hashtable<K, K, H, std::equal_to<>, vespalib::Identity, vespalib::hashtable_base::and_modulator>; \ template class vespalib::Array<vespalib::hash_node<K>>; |