public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-778] libstdc++: Refactor includes for unordered containers Date: Thu, 26 May 2022 12:35:44 +0000 (GMT) [thread overview] Message-ID: <20220526123544.8626838344FA@sourceware.org> (raw) https://gcc.gnu.org/g:692643c3ed3b7b82dde6b890c76b611c3ea371f0 commit r13-778-g692643c3ed3b7b82dde6b890c76b611c3ea371f0 Author: Jonathan Wakely <jwakely@redhat.com> Date: Tue May 24 12:17:01 2022 +0100 libstdc++: Refactor includes for unordered containers This moves some #include directives to the relevant place. For example, <bits/hashtable_policy.h> needs <bits/stl_pair.h> so should include it directly instead of relying on <unordered_map> and <unordered_set> to do so first. libstdc++-v3/ChangeLog: * include/bits/functional_hash.h (__is_fast_hash): Add doxygen comment. * include/bits/hashtable.h: Do not include <bits/stl_function.h> here. * include/bits/hashtable_policy.h: Include <bits/stl_pair.h> and <bits/functional_hash.h>. * include/bits/unordered_map.h: Include required headers. * include/bits/unordered_set.h: Likewise. * include/std/unordered_map: Do not include headers for indirect dependencies. * include/std/unordered_set: Likewise. Diff: --- libstdc++-v3/include/bits/functional_hash.h | 15 +++++++++++---- libstdc++-v3/include/bits/hashtable.h | 3 +-- libstdc++-v3/include/bits/hashtable_policy.h | 2 ++ libstdc++-v3/include/bits/unordered_map.h | 5 +++++ libstdc++-v3/include/bits/unordered_set.h | 5 +++++ libstdc++-v3/include/std/unordered_map | 8 -------- libstdc++-v3/include/std/unordered_set | 8 -------- 7 files changed, 24 insertions(+), 22 deletions(-) diff --git a/libstdc++-v3/include/bits/functional_hash.h b/libstdc++-v3/include/bits/functional_hash.h index c00113eff83..292c0ee03f7 100644 --- a/libstdc++-v3/include/bits/functional_hash.h +++ b/libstdc++-v3/include/bits/functional_hash.h @@ -280,10 +280,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// @} group hashes - // Hint about performance of hash functor. If not fast the hash-based - // containers will cache the hash code. - // Default behavior is to consider that hashers are fast unless specified - // otherwise. + /** Hint about performance of hash functions. + * + * If a given hash function object is not fast, the hash-based containers + * will cache the hash code. + * The default behavior is to consider that hashers are fast unless specified + * otherwise. + * + * Users can specialize this for their own hash functions in order to force + * caching of hash codes in unordered containers. Specializing this trait + * affects the ABI of the unordered containers, so use it carefully. + */ template<typename _Hash> struct __is_fast_hash : public std::true_type { }; diff --git a/libstdc++-v3/include/bits/hashtable.h b/libstdc++-v3/include/bits/hashtable.h index edc151ef15b..29ec1192f32 100644 --- a/libstdc++-v3/include/bits/hashtable.h +++ b/libstdc++-v3/include/bits/hashtable.h @@ -34,11 +34,10 @@ #include <bits/hashtable_policy.h> #include <bits/enable_special_members.h> +#include <bits/stl_function.h> // __has_is_transparent_t #if __cplusplus > 201402L # include <bits/node_handle.h> #endif -#include <bits/functional_hash.h> -#include <bits/stl_function.h> // equal_to, _Identity, _Select1st namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/bits/hashtable_policy.h b/libstdc++-v3/include/bits/hashtable_policy.h index 799c3e986b4..1a259702f98 100644 --- a/libstdc++-v3/include/bits/hashtable_policy.h +++ b/libstdc++-v3/include/bits/hashtable_policy.h @@ -32,7 +32,9 @@ #define _HASHTABLE_POLICY_H 1 #include <tuple> // for std::tuple, std::forward_as_tuple +#include <bits/functional_hash.h> // for __is_fast_hash #include <bits/stl_algobase.h> // for std::min, std::is_permutation. +#include <bits/stl_pair.h> // for std::pair #include <ext/aligned_buffer.h> // for __gnu_cxx::__aligned_buffer #include <ext/alloc_traits.h> // for std::__alloc_rebind #include <ext/numeric_traits.h> // for __gnu_cxx::__int_traits diff --git a/libstdc++-v3/include/bits/unordered_map.h b/libstdc++-v3/include/bits/unordered_map.h index d5edfde8caf..5a3e6f61af2 100644 --- a/libstdc++-v3/include/bits/unordered_map.h +++ b/libstdc++-v3/include/bits/unordered_map.h @@ -30,6 +30,11 @@ #ifndef _UNORDERED_MAP_H #define _UNORDERED_MAP_H +#include <bits/hashtable.h> +#include <bits/allocator.h> +#include <bits/functional_hash.h> // hash +#include <bits/stl_function.h> // equal_to + namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION diff --git a/libstdc++-v3/include/bits/unordered_set.h b/libstdc++-v3/include/bits/unordered_set.h index d2fa2c51171..740bbafd4c9 100644 --- a/libstdc++-v3/include/bits/unordered_set.h +++ b/libstdc++-v3/include/bits/unordered_set.h @@ -30,6 +30,11 @@ #ifndef _UNORDERED_SET_H #define _UNORDERED_SET_H +#include <bits/hashtable.h> +#include <bits/allocator.h> +#include <bits/functional_hash.h> // hash +#include <bits/stl_function.h> // equal_to + namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION diff --git a/libstdc++-v3/include/std/unordered_map b/libstdc++-v3/include/std/unordered_map index e13bb9a2148..b50ec2a8de2 100644 --- a/libstdc++-v3/include/std/unordered_map +++ b/libstdc++-v3/include/std/unordered_map @@ -35,15 +35,7 @@ # include <bits/c++0x_warning.h> #else -#include <type_traits> #include <initializer_list> -#include <bits/allocator.h> -#include <ext/alloc_traits.h> -#include <ext/aligned_buffer.h> -#include <bits/stl_pair.h> -#include <bits/stl_function.h> // equal_to, _Identity, _Select1st -#include <bits/functional_hash.h> -#include <bits/hashtable.h> #include <bits/unordered_map.h> #include <bits/range_access.h> #include <bits/erase_if.h> diff --git a/libstdc++-v3/include/std/unordered_set b/libstdc++-v3/include/std/unordered_set index 8b665718a83..edaa517635b 100644 --- a/libstdc++-v3/include/std/unordered_set +++ b/libstdc++-v3/include/std/unordered_set @@ -35,15 +35,7 @@ # include <bits/c++0x_warning.h> #else -#include <type_traits> #include <initializer_list> -#include <bits/allocator.h> -#include <ext/alloc_traits.h> -#include <ext/aligned_buffer.h> -#include <bits/stl_pair.h> -#include <bits/stl_function.h> // equal_to, _Identity, _Select1st -#include <bits/functional_hash.h> -#include <bits/hashtable.h> #include <bits/unordered_set.h> #include <bits/range_access.h> #include <bits/erase_if.h>
reply other threads:[~2022-05-26 12:35 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20220526123544.8626838344FA@sourceware.org \ --to=redi@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@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: linkBe 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).