aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/include/std/version
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2022-02-14 12:46:10 +0000
committerJonathan Wakely <jwakely@redhat.com>2022-02-14 13:03:31 +0000
commit164a761a9f4798dc69ecab80097807636dc17d61 (patch)
tree56fcdebdec88734259b5fe23a5ba564993aac953 /libstdc++-v3/include/std/version
parent220d85fdf0b5d61e212289fd6ec763980700c572 (diff)
downloadgcc-164a761a9f4798dc69ecab80097807636dc17d61.zip
gcc-164a761a9f4798dc69ecab80097807636dc17d61.tar.gz
gcc-164a761a9f4798dc69ecab80097807636dc17d61.tar.bz2
libstdc++: Use __cpp_concepts instead of custom macro [PR103891]
With the new value of __cpp_concepts required by P2493, we can test whether the compiler supports conditionally trivial special members. This allows us to remove the workaround that disables fully-constexpr std::variant for Clang. Now it should work for non-GCC compilers (such as future releases of Clang) that support conditionally trivial destructors and define the new value of __cpp_concepts. libstdc++-v3/ChangeLog: PR libstdc++/103891 * include/bits/c++config (_GLIBCXX_HAVE_COND_TRIVIAL_SPECIAL_MEMBERS): Remove. * include/std/variant: Check feature test macros instead. * include/std/version: Likewise.
Diffstat (limited to 'libstdc++-v3/include/std/version')
-rw-r--r--libstdc++-v3/include/std/version4
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version
index 30e04b5..24311ee 100644
--- a/libstdc++-v3/include/std/version
+++ b/libstdc++-v3/include/std/version
@@ -175,7 +175,7 @@
# define __cpp_lib_to_chars 201611L
#endif
#define __cpp_lib_unordered_map_try_emplace 201411L
-#ifndef _GLIBCXX_HAVE_COND_TRIVIAL_SPECIAL_MEMBERS
+#if !(__cplusplus >= 202002L && __cpp_concepts >= 202002L)
// N.B. updated value in C++20
# define __cpp_lib_variant 202102L
#endif
@@ -292,7 +292,7 @@
# endif
#define __cpp_lib_to_address 201711L
#define __cpp_lib_to_array 201907L
-#ifdef _GLIBCXX_HAVE_COND_TRIVIAL_SPECIAL_MEMBERS
+#if __cplusplus >= 202002L && __cpp_concepts >= 202002L
# define __cpp_lib_variant 202106L
#endif
#endif