summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Sidwell <nathan@acm.org>2022-05-24 10:17:18 +0100
committerJonathan Wakely <jwakely@redhat.com>2022-07-21 09:57:26 +0100
commit86fd1b0b4aacd81954d8350b9fef81ff40608a2e (patch)
tree4ca9a7807dc8411bd5d755181b9187ab9be143c9
parent545e8fb1418f52fa9541afb03a39233c1106d673 (diff)
libstdc++: Make headers include their prerequisites
These headers were relying on their includers having already included some prerequisites. That makes them unsuitable to be header-units. So directly include the needed headers. Reviewed-by: Jonathan Wakely <jwakely@redhat.com> libstdc++-v3/ChangeLog: * include/bits/hashtable.h: Include required headers. * include/bits/hashtable_policy.h: Likewise. * include/bits/stl_heap.h: Likewise. * include/bits/stl_iterator_base_funcs.h: Likewise. (cherry picked from commit a44380541fee1c7ab14cc90a9af8d1aef3c72866)
-rw-r--r--libstdc++-v3/include/bits/hashtable.h2
-rw-r--r--libstdc++-v3/include/bits/hashtable_policy.h2
-rw-r--r--libstdc++-v3/include/bits/stl_heap.h1
-rw-r--r--libstdc++-v3/include/bits/stl_iterator_base_funcs.h1
4 files changed, 6 insertions, 0 deletions
diff --git a/libstdc++-v3/include/bits/hashtable.h b/libstdc++-v3/include/bits/hashtable.h
index 5e1a417f7cd..edc151ef15b 100644
--- a/libstdc++-v3/include/bits/hashtable.h
+++ b/libstdc++-v3/include/bits/hashtable.h
@@ -37,6 +37,8 @@
#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 0f0b0f9ea51..799c3e986b4 100644
--- a/libstdc++-v3/include/bits/hashtable_policy.h
+++ b/libstdc++-v3/include/bits/hashtable_policy.h
@@ -33,6 +33,8 @@
#include <tuple> // for std::tuple, std::forward_as_tuple
#include <bits/stl_algobase.h> // for std::min, std::is_permutation.
+#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
namespace std _GLIBCXX_VISIBILITY(default)
diff --git a/libstdc++-v3/include/bits/stl_heap.h b/libstdc++-v3/include/bits/stl_heap.h
index 6e08f81c115..eee946c3818 100644
--- a/libstdc++-v3/include/bits/stl_heap.h
+++ b/libstdc++-v3/include/bits/stl_heap.h
@@ -58,6 +58,7 @@
#include <debug/debug.h>
#include <bits/move.h>
#include <bits/predefined_ops.h>
+#include <bits/stl_iterator_base_funcs.h>
namespace std _GLIBCXX_VISIBILITY(default)
{
diff --git a/libstdc++-v3/include/bits/stl_iterator_base_funcs.h b/libstdc++-v3/include/bits/stl_iterator_base_funcs.h
index e9dc54cc628..1551b226ff4 100644
--- a/libstdc++-v3/include/bits/stl_iterator_base_funcs.h
+++ b/libstdc++-v3/include/bits/stl_iterator_base_funcs.h
@@ -63,6 +63,7 @@
#include <bits/concept_check.h>
#include <debug/assertions.h>
+#include <bits/stl_iterator_base_types.h>
namespace std _GLIBCXX_VISIBILITY(default)
{