aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/std/type_traits3
-rw-r--r--libstdc++-v3/include/std/version3
3 files changed, 11 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4c2470c..af7cf3e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2019-01-11 Jakub Jelinek <jakub@redhat.com>
+
+ * include/std/type_traits (__cpp_lib_is_constant_evaluated): Define.
+ * include/std/version (__cpp_lib_is_constant_evaluated): Define.
+
2019-01-11 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/88802
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 275a7f4..2df89ac 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -3030,6 +3030,9 @@ template <typename _From, typename _To>
using unwrap_ref_decay_t = typename unwrap_ref_decay<_Tp>::type;
#ifdef _GLIBCXX_HAVE_BUILTIN_IS_CONSTANT_EVALUATED
+
+#define __cpp_lib_is_constant_evaluated 201811L
+
constexpr inline bool
is_constant_evaluated() noexcept
{ return __builtin_is_constant_evaluated(); }
diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version
index e11ae3a..903b75b 100644
--- a/libstdc++-v3/include/std/version
+++ b/libstdc++-v3/include/std/version
@@ -142,6 +142,9 @@
#if __cplusplus > 201703L
// c++2a
+#ifdef _GLIBCXX_HAVE_BUILTIN_IS_CONSTANT_EVALUATED
+# define __cpp_lib_is_constant_evaluated 201811L
+#endif
#define __cpp_lib_list_remove_return_type 201806L
#endif // C++2a
#endif // C++17