diff mbox series

[committed,1/3] libstdc++: Make headers include their prerequisites

Message ID 20220526123632.1284224-1-jwakely@redhat.com
State Committed
Commit a44380541fee1c7ab14cc90a9af8d1aef3c72866
Headers
Series [committed,1/3] libstdc++: Make headers include their prerequisites |

Commit Message

Jonathan Wakely May 26, 2022, 12:36 p.m. UTC 
  From: Nathan Sidwell <nathan@acm.org>

Tested powerpc64le-linux, pushed to trunk.

-- >8 --

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.
---
 libstdc++-v3/include/bits/hashtable.h               | 2 ++
 libstdc++-v3/include/bits/hashtable_policy.h        | 2 ++
 libstdc++-v3/include/bits/stl_heap.h                | 1 +
 libstdc++-v3/include/bits/stl_iterator_base_funcs.h | 1 +
 4 files changed, 6 insertions(+)
diff mbox series

Patch

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)
 {