[gcc(refs/users/guojiufu/heads/personal-branch)] libstdc++: Add missing feature test macros
Jiu Fu Guo
guojiufu@gcc.gnu.org
Mon Apr 27 09:40:30 GMT 2020
https://gcc.gnu.org/g:56772f623e2270f0c6bfaf64e0bb41d4b6085dc4
commit 56772f623e2270f0c6bfaf64e0bb41d4b6085dc4
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Wed Apr 22 22:54:34 2020 +0100
libstdc++: Add missing feature test macros
These macros all correspond to features that are already supported, but
the macro was not defined when the feature was implemented.
* include/bits/ptr_traits.h (__cpp_lib_constexpr_memory): Define to
indicate P1006R1 support.
(__cpp_lib_to_address): Define to indicate P0653R2 support.
* include/bits/range_access.h (__cpp_lib_ssize): Define to indicate
P1227R2 support.
* include/bits/ranges_algo.h (__cpp_lib_shift): Define to indicate
P0769R2 support.
* include/std/atomic (__cpp_lib_atomic_float): Define to indicate
P0020R6 support.
* include/std/memory (__cpp_lib_assume_aligned): Define to indicate
P1007R3 support.
* include/std/memory_resource (__cpp_lib_polymorphic_allocator):
Define to indicate P0339R6 support.
* include/std/string_view (__cpp_lib_starts_ends_with): Define to
indicate P0457R2 support.
* include/std/type_traits (__cpp_lib_is_nothrow_convertible): Define
to indicate P0758R1 support.
(__cpp_lib_remove_cvref): Define to indicate P0550R2 support.
(__cpp_lib_type_identity): Define to indicate P0887R1 support.
* include/std/version (__cpp_lib_atomic_float)
(__cpp_lib_is_nothrow_convertible, __cpp_lib_remove_cvref)
(__cpp_lib_type_identity, __cpp_lib_assume_aligned)
(__cpp_lib_constexpr_memory, __cpp_lib_polymorphic_allocator)
(__cpp_lib_shift, __cpp_lib_ssize, __cpp_lib_starts_ends_with)
(__cpp_lib_to_address): Define.
* testsuite/20_util/to_address/1_neg.cc: Adjust dg-error line number.
Diff:
---
libstdc++-v3/ChangeLog | 27 ++++++++++++++++++++++
libstdc++-v3/include/bits/ptr_traits.h | 3 +++
libstdc++-v3/include/bits/range_access.h | 1 +
libstdc++-v3/include/bits/ranges_algo.h | 1 +
libstdc++-v3/include/std/atomic | 1 +
libstdc++-v3/include/std/memory | 1 +
libstdc++-v3/include/std/memory_resource | 1 +
libstdc++-v3/include/std/string_view | 1 +
libstdc++-v3/include/std/type_traits | 4 ++++
libstdc++-v3/include/std/version | 12 ++++++++++
libstdc++-v3/testsuite/20_util/to_address/1_neg.cc | 2 +-
11 files changed, 53 insertions(+), 1 deletion(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4fd72daa942..182f5dc4b7e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,32 @@
2020-04-22 Jonathan Wakely <jwakely@redhat.com>
+ * include/bits/ptr_traits.h (__cpp_lib_constexpr_memory): Define to
+ indicate P1006R1 support.
+ (__cpp_lib_to_address): Define to indicate P0653R2 support.
+ * include/bits/range_access.h (__cpp_lib_ssize): Define to indicate
+ P1227R2 support.
+ * include/bits/ranges_algo.h (__cpp_lib_shift): Define to indicate
+ P0769R2 support.
+ * include/std/atomic (__cpp_lib_atomic_float): Define to indicate
+ P0020R6 support.
+ * include/std/memory (__cpp_lib_assume_aligned): Define to indicate
+ P1007R3 support.
+ * include/std/memory_resource (__cpp_lib_polymorphic_allocator):
+ Define to indicate P0339R6 support.
+ * include/std/string_view (__cpp_lib_starts_ends_with): Define to
+ indicate P0457R2 support.
+ * include/std/type_traits (__cpp_lib_is_nothrow_convertible): Define
+ to indicate P0758R1 support.
+ (__cpp_lib_remove_cvref): Define to indicate P0550R2 support.
+ (__cpp_lib_type_identity): Define to indicate P0887R1 support.
+ * include/std/version (__cpp_lib_atomic_float)
+ (__cpp_lib_is_nothrow_convertible, __cpp_lib_remove_cvref)
+ (__cpp_lib_type_identity, __cpp_lib_assume_aligned)
+ (__cpp_lib_constexpr_memory, __cpp_lib_polymorphic_allocator)
+ (__cpp_lib_shift, __cpp_lib_ssize, __cpp_lib_starts_ends_with)
+ (__cpp_lib_to_address): Define.
+ * testsuite/20_util/to_address/1_neg.cc: Adjust dg-error line number.
+
* include/bits/stl_map.h (__cpp_lib_map_insertion): Remove old
macro.
* include/bits/unordered_map.h (__cpp_lib_unordered_map_insertion):
diff --git a/libstdc++-v3/include/bits/ptr_traits.h b/libstdc++-v3/include/bits/ptr_traits.h
index 8fd91bf7bf2..541abab29e1 100644
--- a/libstdc++-v3/include/bits/ptr_traits.h
+++ b/libstdc++-v3/include/bits/ptr_traits.h
@@ -35,6 +35,7 @@
#include <bits/move.h>
#if __cplusplus > 201703L
+#define __cpp_lib_constexpr_memory 201811L
namespace __gnu_debug { struct _Safe_iterator_base; }
#endif
@@ -180,6 +181,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return std::__to_address(__ptr.operator->());
}
+#define __cpp_lib_to_address 201711L
+
/**
* @brief Obtain address referenced by a pointer to an object
* @param __ptr A pointer to an object
diff --git a/libstdc++-v3/include/bits/range_access.h b/libstdc++-v3/include/bits/range_access.h
index acd701e1385..82d9e2180c5 100644
--- a/libstdc++-v3/include/bits/range_access.h
+++ b/libstdc++-v3/include/bits/range_access.h
@@ -322,6 +322,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#endif // C++17
#if __cplusplus > 201703L
+#define __cpp_lib_ssize 201902L
template<typename _Container>
constexpr auto
ssize(const _Container& __cont)
diff --git a/libstdc++-v3/include/bits/ranges_algo.h b/libstdc++-v3/include/bits/ranges_algo.h
index 56fbd50ce8e..aa07cb97ea6 100644
--- a/libstdc++-v3/include/bits/ranges_algo.h
+++ b/libstdc++-v3/include/bits/ranges_algo.h
@@ -3691,6 +3691,7 @@ namespace ranges
} // namespace ranges
+#define __cpp_lib_shift 201806L
template<class ForwardIterator>
constexpr ForwardIterator
shift_left(ForwardIterator __first, ForwardIterator __last,
diff --git a/libstdc++-v3/include/std/atomic b/libstdc++-v3/include/std/atomic
index 40f23bdfc96..a455286a784 100644
--- a/libstdc++-v3/include/std/atomic
+++ b/libstdc++-v3/include/std/atomic
@@ -1477,6 +1477,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ return atomic_fetch_xor_explicit(__a, __i, memory_order_seq_cst); }
#if __cplusplus > 201703L
+#define __cpp_lib_atomic_float 201711L
template<>
struct atomic<float> : __atomic_float<float>
{
diff --git a/libstdc++-v3/include/std/memory b/libstdc++-v3/include/std/memory
index aaee6e42c1a..1e8eebd731c 100644
--- a/libstdc++-v3/include/std/memory
+++ b/libstdc++-v3/include/std/memory
@@ -180,6 +180,7 @@ get_pointer_safety() noexcept { return pointer_safety::relaxed; }
// @}
#if __cplusplus > 201703L
+#define __cpp_lib_assume_aligned 201811L
/** @brief Inform the compiler that a pointer is aligned.
*
* @tparam _Align An alignment value (i.e. a power of two)
diff --git a/libstdc++-v3/include/std/memory_resource b/libstdc++-v3/include/std/memory_resource
index f87ef9688f3..514c9888e7a 100644
--- a/libstdc++-v3/include/std/memory_resource
+++ b/libstdc++-v3/include/std/memory_resource
@@ -61,6 +61,7 @@ namespace pmr
template<typename _Tp>
class polymorphic_allocator;
#else // C++20
+# define __cpp_lib_polymorphic_allocator 201902L
template<typename _Tp = std::byte>
class polymorphic_allocator;
#endif
diff --git a/libstdc++-v3/include/std/string_view b/libstdc++-v3/include/std/string_view
index b5d8eab2f33..289d4743548 100644
--- a/libstdc++-v3/include/std/string_view
+++ b/libstdc++-v3/include/std/string_view
@@ -322,6 +322,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
#if __cplusplus > 201703L
+#define __cpp_lib_starts_ends_with 201711L
constexpr bool
starts_with(basic_string_view __x) const noexcept
{ return this->substr(0, __x.size()) == __x; }
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index f96b5297b83..75a98e38c0a 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -1489,6 +1489,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ };
#if __cplusplus > 201703L
+#define __cpp_lib_is_nothrow_convertible 201806L
/// is_nothrow_convertible
template<typename _From, typename _To>
struct is_nothrow_convertible
@@ -3221,6 +3222,8 @@ template <typename _From, typename _To>
#endif // C++17
#if __cplusplus > 201703L
+#define __cpp_lib_remove_cvref 201711L
+
/// Remove references and cv-qualifiers.
template<typename _Tp>
struct remove_cvref
@@ -3231,6 +3234,7 @@ template <typename _From, typename _To>
template<typename _Tp>
using remove_cvref_t = __remove_cvref_t<_Tp>;
+#define __cpp_lib_type_identity 201806L
/// Identity metafunction.
template<typename _Tp>
struct type_identity { using type = _Tp; };
diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version
index 48547c63014..3b1fd700069 100644
--- a/libstdc++-v3/include/std/version
+++ b/libstdc++-v3/include/std/version
@@ -161,10 +161,12 @@
#if __cplusplus > 201703L
// c++2a
+#define __cpp_lib_atomic_float 201711L
#define __cpp_lib_atomic_ref 201806L
#define __cpp_lib_atomic_value_initialization 201911L
#define __cpp_lib_bitops 201907L
#define __cpp_lib_bounded_array_traits 201902L
+// __cpp_lib_char8_t is defined in <bits/c++config.h>
#if __cpp_concepts >= 201907L
# define __cpp_lib_concepts 201806L
#endif
@@ -176,15 +178,20 @@
#ifdef _GLIBCXX_HAVE_BUILTIN_IS_CONSTANT_EVALUATED
# define __cpp_lib_is_constant_evaluated 201811L
#endif
+#define __cpp_lib_is_nothrow_convertible 201806L
+#define __cpp_lib_remove_cvref 201711L
+#define __cpp_lib_type_identity 201806L
#define __cpp_lib_unwrap_ref 201811L
#if _GLIBCXX_HOSTED
+#define __cpp_lib_assume_aligned 201811L
#define __cpp_lib_bind_front 201907L
#define __cpp_lib_integer_comparison_functions 202002L
#define __cpp_lib_constexpr_algorithms 201806L
#define __cpp_lib_constexpr_complex 201711L
#define __cpp_lib_constexpr_dynamic_alloc 201907L
#define __cpp_lib_constexpr_invoke 201907L
+#define __cpp_lib_constexpr_memory 201811L
#define __cpp_lib_constexpr_numeric 201911L
#define __cpp_lib_erase_if 202002L
#define __cpp_lib_interpolate 201902L
@@ -193,13 +200,18 @@
#endif
#define __cpp_lib_list_remove_return_type 201806L
#define __cpp_lib_math_constants 201907L
+#define __cpp_lib_polymorphic_allocator 201902L
#if __cpp_lib_concepts
# define __cpp_lib_ranges 201911L
#endif
+#define __cpp_lib_shift 201806L
#define __cpp_lib_span 202002L
+#define __cpp_lib_ssize 201902L
+#define __cpp_lib_starts_ends_with 201711L
#if __cpp_impl_three_way_comparison >= 201907L && __cpp_lib_concepts
# define __cpp_lib_three_way_comparison 201907L
#endif
+#define __cpp_lib_to_address 201711L
#define __cpp_lib_to_array 201907L
#endif
#endif // C++2a
diff --git a/libstdc++-v3/testsuite/20_util/to_address/1_neg.cc b/libstdc++-v3/testsuite/20_util/to_address/1_neg.cc
index ee64a2281fb..cb9f8dc0681 100644
--- a/libstdc++-v3/testsuite/20_util/to_address/1_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/to_address/1_neg.cc
@@ -17,7 +17,7 @@
// { dg-options "-std=gnu++2a" }
// { dg-do compile { target c++2a } }
-// { dg-error "not a function pointer" "" { target *-*-* } 157 }
+// { dg-error "not a function pointer" "" { target *-*-* } 158 }
#include <memory>
More information about the Libstdc++-cvs
mailing list