diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2021-07-13 12:09:37 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2021-07-13 12:09:37 +0100 |
| commit | bd1eb556b910fd4853ea83291e495d40adbcdf81 (patch) | |
| tree | 2df3bb2138ffc86da4099541f8275b90114e9dd9 | |
| parent | 1583b8bff0be7e41aa721dde79f90ca0763bd4e2 (diff) | |
| download | gcc-bd1eb556b910fd4853ea83291e495d40adbcdf81.zip gcc-bd1eb556b910fd4853ea83291e495d40adbcdf81.tar.gz gcc-bd1eb556b910fd4853ea83291e495d40adbcdf81.tar.bz2 | |
libstdc++: Remove duplicate #include in <string_view>
When I added the new C++23 constructor I added a conditional include of
<bits/ranges_base.h>, which was already being included unconditionally.
This removes the unconditional include but changes the condition for the
other one, so it's used for C++20 as well.
Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
libstdc++-v3/ChangeLog:
* include/std/string_view: Only include <bits/ranges_base.h>
once, and only for C++20 and later.
| -rw-r--r-- | libstdc++-v3/include/std/string_view | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libstdc++-v3/include/std/string_view b/libstdc++-v3/include/std/string_view index 33e2129..cfdcf28 100644 --- a/libstdc++-v3/include/std/string_view +++ b/libstdc++-v3/include/std/string_view @@ -41,11 +41,10 @@ #include <bits/char_traits.h> #include <bits/functional_hash.h> #include <bits/range_access.h> -#include <bits/ranges_base.h> #include <bits/ostream_insert.h> #include <ext/numeric_traits.h> -#if __cplusplus > 202002L +#if __cplusplus >= 202002L # include <bits/ranges_base.h> #endif |