diff options
| author | François Dumont <fdumont@gcc.gnu.org> | 2015-04-30 07:13:37 +0000 |
|---|---|---|
| committer | François Dumont <fdumont@gcc.gnu.org> | 2015-04-30 07:13:37 +0000 |
| commit | 2f132d1d2c39d65bf03dc0234977366f13dc38f7 (patch) | |
| tree | 047212af58f6a6cca38d4537f7f3a761703f4e97 /libstdc++-v3/src | |
| parent | 2fc3c9a59b046f462fe13232768f5efc023928ea (diff) | |
| download | gcc-2f132d1d2c39d65bf03dc0234977366f13dc38f7.zip gcc-2f132d1d2c39d65bf03dc0234977366f13dc38f7.tar.gz gcc-2f132d1d2c39d65bf03dc0234977366f13dc38f7.tar.bz2 | |
hashtable_policy.h (_Prime_rehash_policy::_S_n_primes): Delete.
2015-04-30 François Dumont <fdumont@gcc.gnu.org>
* include/bits/hashtable_policy.h (_Prime_rehash_policy::_S_n_primes):
Delete.
* src/c++11/hashtable_c++0x.cc (_Prime_rehash_policy::_M_next_bkt):
Remove usage of latter and compute size of the prime numbers array
locally.
From-SVN: r222611
Diffstat (limited to 'libstdc++-v3/src')
| -rw-r--r-- | libstdc++-v3/src/c++11/hashtable_c++0x.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libstdc++-v3/src/c++11/hashtable_c++0x.cc b/libstdc++-v3/src/c++11/hashtable_c++0x.cc index 22de51b..69f999f 100644 --- a/libstdc++-v3/src/c++11/hashtable_c++0x.cc +++ b/libstdc++-v3/src/c++11/hashtable_c++0x.cc @@ -56,8 +56,10 @@ namespace __detail return __fast_bkt[__n]; } + constexpr auto __n_primes + = sizeof(__prime_list) / sizeof(unsigned long) - 1; const unsigned long* __next_bkt = - std::lower_bound(__prime_list + 5, __prime_list + _S_n_primes, __n); + std::lower_bound(__prime_list + 5, __prime_list + __n_primes, __n); _M_next_resize = __builtin_ceil(*__next_bkt * (long double)_M_max_load_factor); return *__next_bkt; |