libstdc++: Fix unconditional definition of __cpp_lib_span in <version> [PR 97869}
authorJonathan Wakely <jwakely@redhat.com>
Tue, 17 Nov 2020 15:26:29 +0000 (15:26 +0000)
committerJonathan Wakely <jwakely@redhat.com>
Tue, 17 Nov 2020 16:13:14 +0000 (16:13 +0000)
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.

libstdc++-v3/include/precompiled/stdc++.h
libstdc++-v3/include/std/version

index 8899c32..a418c46 100644 (file)
 #include <bit>
 #include <compare>
 #include <concepts>
+#if __cpp_impl_coroutine
+# include <coroutine>
+#endif
 #include <numbers>
 #include <ranges>
 #include <span>
index 7f51ef3..12455ad 100644 (file)
 # 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