From: "François Dumont" <frs.dumont@gmail.com>
To: "libstdc++@gcc.gnu.org" <libstdc++@gcc.gnu.org>,
gcc-patches <gcc-patches@gcc.gnu.org>
Subject: Re: Hide _S_n_primes from user code
Date: Wed, 22 Apr 2015 20:11:00 -0000 [thread overview]
Message-ID: <55380079.3000105@gmail.com> (raw)
In-Reply-To: <5537F904.4010405@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 559 bytes --]
With the patch this time.
On 22/04/2015 21:39, François Dumont wrote:
> Hello
>
> Here is a rather trivial patch, just code cleanup. Since we export
> _Prime_rehash_policy we do not need to expose the _S_n_primes anymore.
>
> * 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.
>
> Tested under Linux x86_64.
>
> Ok to commit ?
>
> François
>
[-- Attachment #2: hashtable.patch --]
[-- Type: text/x-patch, Size: 1215 bytes --]
diff --git a/libstdc++-v3/include/bits/hashtable_policy.h b/libstdc++-v3/include/bits/hashtable_policy.h
index 14bcca6..a9ad7dd 100644
--- a/libstdc++-v3/include/bits/hashtable_policy.h
+++ b/libstdc++-v3/include/bits/hashtable_policy.h
@@ -495,8 +495,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_M_reset(_State __state)
{ _M_next_resize = __state; }
- enum { _S_n_primes = sizeof(unsigned long) != 8 ? 256 : 256 + 48 };
-
static const std::size_t _S_growth_factor = 2;
float _M_max_load_factor;
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;
next prev parent reply other threads:[~2015-04-22 20:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-22 19:39 François Dumont
2015-04-22 20:11 ` François Dumont [this message]
2015-04-27 11:32 ` Jonathan Wakely
2015-04-22 20:13 ` Marek Polacek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55380079.3000105@gmail.com \
--to=frs.dumont@gmail.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).