diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2017-10-30 14:54:28 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2017-10-30 14:54:28 +0000 |
| commit | 02a2c6303f223f529509fffa6ea1ce40054f3e02 (patch) | |
| tree | 3a24772bda8b6e8f040867df74223ca36b8fb89d | |
| parent | ccbbf8df05abc41ef86565706976c5ad403291e7 (diff) | |
| download | gcc-02a2c6303f223f529509fffa6ea1ce40054f3e02.zip gcc-02a2c6303f223f529509fffa6ea1ce40054f3e02.tar.gz gcc-02a2c6303f223f529509fffa6ea1ce40054f3e02.tar.bz2 | |
Minor header reorganization for unordered containers
* include/bits/hashtable_policy.h: Include <tuple>.
* include/std/unordered_map: Only include <bits/stl_pair.h> instead
of <utility> and <tuple>.
* include/std/unordered_set: Likewise.
From-SVN: r254223
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/hashtable_policy.h | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/unordered_map | 3 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/unordered_set | 3 |
4 files changed, 12 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 994eca8..7bafbd4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2017-10-30 Jonathan Wakely <jwakely@redhat.com> + + * include/bits/hashtable_policy.h: Include <tuple>. + * include/std/unordered_map: Only include <bits/stl_pair.h> instead + of <utility> and <tuple>. + * include/std/unordered_set: Likewise. + 2017-10-30 Ville Voutilainen <ville.voutilainen@gmail.com> Implement LWG 2485 diff --git a/libstdc++-v3/include/bits/hashtable_policy.h b/libstdc++-v3/include/bits/hashtable_policy.h index da6d49c..e19f92a 100644 --- a/libstdc++-v3/include/bits/hashtable_policy.h +++ b/libstdc++-v3/include/bits/hashtable_policy.h @@ -31,7 +31,9 @@ #ifndef _HASHTABLE_POLICY_H #define _HASHTABLE_POLICY_H 1 -#include <bits/stl_algobase.h> // for std::min. +#include <tuple> // for std::tuple, std::forward_as_tuple +#include <cstdint> // for std::uint_fast64_t +#include <bits/stl_algobase.h> // for std::min. namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/std/unordered_map b/libstdc++-v3/include/std/unordered_map index 2cdcd37..8077323 100644 --- a/libstdc++-v3/include/std/unordered_map +++ b/libstdc++-v3/include/std/unordered_map @@ -35,13 +35,12 @@ # include <bits/c++0x_warning.h> #else -#include <utility> #include <type_traits> #include <initializer_list> -#include <tuple> #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> diff --git a/libstdc++-v3/include/std/unordered_set b/libstdc++-v3/include/std/unordered_set index 2646c0f..faf7ebe 100644 --- a/libstdc++-v3/include/std/unordered_set +++ b/libstdc++-v3/include/std/unordered_set @@ -35,13 +35,12 @@ # include <bits/c++0x_warning.h> #else -#include <utility> #include <type_traits> #include <initializer_list> -#include <tuple> #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> |