From 650eadd63022baf6993124d7e9b64141b908459a Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 24 May 2022 12:15:00 +0100
Subject: [PATCH] libstdc++: Remove some unnecessary includes

These headers do not use anything in <bits/stl_iterator_base_types.h>
directly, and it's included by <bits/stl_iterator_base_funcs.h> and
<bits/stl_iterator.h> anyway, because they do need it.

libstdc++-v3/ChangeLog:

	* include/bits/ranges_algobase.h: Do not include
	<bits/stl_iterator_base_types.h>.
	* include/std/string: Likewise.
	* include/std/variant: Likewise.
---
 libstdc++-v3/include/bits/ranges_algobase.h | 1 -
 libstdc++-v3/include/std/string             | 1 -
 libstdc++-v3/include/std/variant            | 1 -
 3 files changed, 3 deletions(-)

diff --git a/libstdc++-v3/include/bits/ranges_algobase.h b/libstdc++-v3/include/bits/ranges_algobase.h
index 1bbc44fc668..f6f0b9c83b0 100644
--- a/libstdc++-v3/include/bits/ranges_algobase.h
+++ b/libstdc++-v3/include/bits/ranges_algobase.h
@@ -33,7 +33,6 @@
 #if __cplusplus > 201703L
 
 #include <compare>
-#include <bits/stl_iterator_base_types.h>
 #include <bits/stl_iterator_base_funcs.h>
 #include <bits/stl_iterator.h>
 #include <bits/ranges_base.h> // ranges::begin, ranges::range etc.
diff --git a/libstdc++-v3/include/std/string b/libstdc++-v3/include/std/string
index 24051663f74..4a0633067bd 100644
--- a/libstdc++-v3/include/std/string
+++ b/libstdc++-v3/include/std/string
@@ -42,7 +42,6 @@
 #include <bits/cpp_type_traits.h>
 #include <bits/localefwd.h>    // For operators >>, <<, and getline.
 #include <bits/ostream_insert.h>
-#include <bits/stl_iterator_base_types.h>
 #include <bits/stl_iterator_base_funcs.h>
 #include <bits/stl_iterator.h>
 #include <bits/stl_function.h> // For less
diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant
index beed396fccb..c5f25ef6b47 100644
--- a/libstdc++-v3/include/std/variant
+++ b/libstdc++-v3/include/std/variant
@@ -40,7 +40,6 @@
 #include <bits/functional_hash.h>
 #include <bits/invoke.h>
 #include <bits/parse_numbers.h>
-#include <bits/stl_iterator_base_types.h>
 #include <bits/stl_iterator_base_funcs.h>
 #include <bits/stl_construct.h>
 #include <bits/utility.h> // in_place_index_t
-- 
2.47.2