diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2020-11-17 15:26:29 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2020-11-17 16:13:14 +0000 |
| commit | ecf65330c11544ebf35e198087b4a42be089c620 (patch) | |
| tree | 1e03fe11473e513d9a7d8429367a75f20bdc1e8d /libstdc++-v3 | |
| parent | 1f8ac759918729e9402c3154c8e5110bfd4c6459 (diff) | |
| download | gcc-ecf65330c11544ebf35e198087b4a42be089c620.zip gcc-ecf65330c11544ebf35e198087b4a42be089c620.tar.gz gcc-ecf65330c11544ebf35e198087b4a42be089c620.tar.bz2 | |
libstdc++: Fix unconditional definition of __cpp_lib_span in <version> [PR 97869}
The <span> header is empty unless Concepts are supported, but <version>
defines the __cpp_lib_span feature test macro unconditionally. It should
be guarded by the same conditions as in <span>.
libstdc++-v3/ChangeLog:
PR libstdc++/97869
* include/precompiled/stdc++.h: Include <coroutine>.
* include/std/version (__cpp_lib_span): Check __cpp_lib_concepts
before defining.
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/include/precompiled/stdc++.h | 3 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/version | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/include/precompiled/stdc++.h b/libstdc++-v3/include/precompiled/stdc++.h index 8899c32..a418c462 100644 --- a/libstdc++-v3/include/precompiled/stdc++.h +++ b/libstdc++-v3/include/precompiled/stdc++.h @@ -137,6 +137,9 @@ #include <bit> #include <compare> #include <concepts> +#if __cpp_impl_coroutine +# include <coroutine> +#endif #include <numbers> #include <ranges> #include <span> diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version index 7f51ef3..12455ad 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -226,7 +226,9 @@ # define __cpp_lib_ranges 201911L #endif #define __cpp_lib_shift 201806L -#define __cpp_lib_span 202002L +#if __cpp_lib_concepts +# define __cpp_lib_span 202002L +#endif #define __cpp_lib_ssize 201902L #define __cpp_lib_starts_ends_with 201711L # if _GLIBCXX_USE_CXX11_ABI |