[PATCH][Hashtable 5/6] Remove H1/H2 template parameters

[François Dumont]

H1 used to be a reference to the user Hash, now _Hashtable and unordered 
types agree on the same Hash type which is more intuitive.

I also chose to not support anymore a stateful ranged hash functor. We 
only use _Mod_range_hashing and _Mask_range_hashing.

Thanks to this simplification _M_bucket_index can also be simplified.

 Â Â Â  * include/bits/hashtable_policy.h (_Hashtable<>): Remove _H1 and _H2
 Â Â Â  template parameters.
 Â Â Â  (_Hastable_base<>): Likewise.
 Â Â Â  (_Default_ranged_hash): Remove.
 Â Â Â  (_Prime_rehash_policy::__ranged_hash): New.
 Â Â Â  (_Power2_rehash_policy::__ranged_hash): New.
 Â Â Â  (_Map_base<>): Remove _H1 and _H2 template parameters.
 Â Â Â  (_Insert_base<>): Likewise.
 Â Â Â  (_Insert<>): Likewise.
 Â Â Â  (_Rehash_base<>): Likewise.
 Â Â Â  (_Local_iterator_base<>): Remove _H1 and _H2 template parameters 
and add
 Â Â Â  _RangedHash.
 Â Â Â  (_Hash_code_base<>): Likewise.
 Â Â Â  (_Hash_code_base<_Key, _Value, _ExtractKey, _H1, _H2, _Hash,
 Â Â Â  __hash_not_cached_t>): Remove.
 Â Â Â  (_Hash_code_base<>::_M_bucket_index(const _Key&, __hash_code, size_t)):
 Â Â Â  Replace by...
 Â Â Â  (_Hash_code_base<>::_M_bucket_index(__hash_code, size_t)): ...this.
 Â Â Â  (_Local_iterator<>): Remove _H1 and _H2 template parameters.
 Â Â Â  (_Local_const_iterator<>): Likewise.
 Â Â Â  (_Equality<>): Likewise.
 Â Â Â  * include/bits/hashtable.h (_Hashtable<>): Remove _H1 and _H2 template
 Â Â Â  parameters.
 Â Â Â  * include/bits/node_handle.h: Adapt.
 Â Â Â  * include/bits/unordered_map.h: Adapt.
 Â Â Â  * include/bits/unordered_set.h: Adapt.
 Â Â Â  * testsuite/23_containers/unordered_set/hash_policy/26132.cc: Adapt.
 Â Â Â  * testsuite/23_containers/unordered_set/hash_policy/71181.cc: Adapt.
 Â Â Â  * testsuite/23_containers/unordered_set/hash_policy/load_factor.cc:
 Â Â Â  Adapt.
 Â Â Â  * testsuite/23_containers/unordered_set/hash_policy/rehash.cc: Adapt.
 Â Â Â  * testsuite/23_containers/unordered_set/insert/hash_policy.cc: Adapt.
 Â Â Â  * testsuite/23_containers/unordered_set/max_load_factor/robustness.cc:
 Â Â Â  Adapt.
 Â Â Â  * testsuite/performance/23_containers/insert/54075.cc: Adapt.
 Â Â Â  * testsuite/performance/23_containers/insert_erase/41975.cc: Adapt.
 Â Â Â  * testsuite/performance/23_containers/insert_erase/
 Â Â Â  unordered_small_size.cc: Adapt.

Tested under Linux x86_64.

François


-------------- next part --------------
A non-text attachment was scrubbed...
Name: hashtable#6.patch
Type: text/x-patch
Size: 88317 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/libstdc++/attachments/20191117/1f6a95dd/attachment.bin>