libstdc++: Update __cpp_lib_erase_if macro (P1115R3)

Now that this feature has been approved for C++20 we can define the
macro to the official value.

	* include/bits/erase_if.h (__cpp_lib_erase_if): Define to 202002L.
	* include/std/deque: Likewise.
	* include/std/forward_list: Likewise.
	* include/std/list: Likewise.
	* include/std/string: Likewise.
	* include/std/vector: Likewise.
	* include/std/version: Likewise.
	* testsuite/23_containers/deque/erasure.cc: Test for new value.
	* testsuite/23_containers/forward_list/erasure.cc: Likewise.
	* testsuite/23_containers/list/erasure.cc: Likewise.
	* testsuite/23_containers/map/erasure.cc: Likewise.
	* testsuite/23_containers/set/erasure.cc: Likewise.
	* testsuite/23_containers/unordered_map/erasure.cc: Likewise.
	* testsuite/23_containers/unordered_set/erasure.cc: Likewise.
	* testsuite/23_containers/vector/erasure.cc: Likewise.

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8e24870..3c77205 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,23 @@
 2020-02-15  Jonathan Wakely  <jwakely@redhat.com>
 
+       * include/bits/erase_if.h (__cpp_lib_erase_if): Define to 202002L.
+       * include/std/deque: Likewise.
+       * include/std/forward_list: Likewise.
+       * include/std/list: Likewise.
+       * include/std/string: Likewise.
+       * include/std/vector: Likewise.
+       * include/std/version: Likewise.
+       * testsuite/23_containers/deque/erasure.cc: Test for new value.
+       * testsuite/23_containers/forward_list/erasure.cc: Likewise.
+       * testsuite/23_containers/list/erasure.cc: Likewise.
+       * testsuite/23_containers/map/erasure.cc: Likewise.
+       * testsuite/23_containers/set/erasure.cc: Likewise.
+       * testsuite/23_containers/unordered_map/erasure.cc: Likewise.
+       * testsuite/23_containers/unordered_set/erasure.cc: Likewise.
+       * testsuite/23_containers/vector/erasure.cc: Likewise.
+
+2020-02-15  Jonathan Wakely  <jwakely@redhat.com>
+
        * include/bits/random.h (uniform_random_bit_generator): Require min()
        and max() to be constant expressions and min() to be less than max().
        * testsuite/26_numerics/random/concept.cc: Check additional cases.

diff --git a/libstdc++-v3/include/bits/erase_if.h b/libstdc++-v3/include/bits/erase_if.h
index 2641fe6..dc5e6ae 100644 (file)
--- a/libstdc++-v3/include/bits/erase_if.h
+++ b/libstdc++-v3/include/bits/erase_if.h
@@ -39,7 +39,7 @@ namespace std
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
 #if __cplusplus > 201703L
-# define __cpp_lib_erase_if 201900L
+# define __cpp_lib_erase_if 202002L
 #endif
 
   namespace __detail

diff --git a/libstdc++-v3/include/std/deque b/libstdc++-v3/include/std/deque
index efe04db..07e2c69 100644 (file)
--- a/libstdc++-v3/include/std/deque
+++ b/libstdc++-v3/include/std/deque
@@ -91,7 +91,7 @@ namespace std _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
-#define __cpp_lib_erase_if 201900L
+#define __cpp_lib_erase_if 202002L
 
   template<typename _Tp, typename _Alloc, typename _Predicate>
     inline typename deque<_Tp, _Alloc>::size_type

diff --git a/libstdc++-v3/include/std/forward_list b/libstdc++-v3/include/std/forward_list
index 8eb1ad1..439ef6b 100644 (file)
--- a/libstdc++-v3/include/std/forward_list
+++ b/libstdc++-v3/include/std/forward_list
@@ -62,7 +62,7 @@ namespace std _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
-#define __cpp_lib_erase_if 201900L
+#define __cpp_lib_erase_if 202002L
 
   template<typename _Tp, typename _Alloc, typename _Predicate>
     inline typename forward_list<_Tp, _Alloc>::size_type 

diff --git a/libstdc++-v3/include/std/list b/libstdc++-v3/include/std/list
index 1fb51a5..7b3d3c2 100644 (file)
--- a/libstdc++-v3/include/std/list
+++ b/libstdc++-v3/include/std/list
@@ -86,7 +86,7 @@ namespace std _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
-#define __cpp_lib_erase_if 201900L
+#define __cpp_lib_erase_if 202002L
 
   template<typename _Tp, typename _Alloc, typename _Predicate>
     inline typename list<_Tp, _Alloc>::size_type

diff --git a/libstdc++-v3/include/std/string b/libstdc++-v3/include/std/string
index 6a3b61f..a95ef4d 100644 (file)
--- a/libstdc++-v3/include/std/string
+++ b/libstdc++-v3/include/std/string
@@ -118,7 +118,7 @@ namespace std _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
-#define __cpp_lib_erase_if 201900L
+#define __cpp_lib_erase_if 202002L
 
   template<typename _CharT, typename _Traits, typename _Alloc,
           typename _Predicate>

diff --git a/libstdc++-v3/include/std/vector b/libstdc++-v3/include/std/vector
index 2a7b4c0..6f587a8 100644 (file)
--- a/libstdc++-v3/include/std/vector
+++ b/libstdc++-v3/include/std/vector
@@ -101,7 +101,7 @@ namespace std _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
-#define __cpp_lib_erase_if 201900L
+#define __cpp_lib_erase_if 202002L
 
   template<typename _Tp, typename _Alloc, typename _Predicate>
     inline typename vector<_Tp, _Alloc>::size_type

diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version
index d8a9776..8a4affa 100644 (file)
--- a/libstdc++-v3/include/std/version
+++ b/libstdc++-v3/include/std/version
@@ -184,7 +184,7 @@
 #define __cpp_lib_constexpr_complex 201711L
 #define __cpp_lib_constexpr_dynamic_alloc 201907L
 #define __cpp_lib_constexpr_invoke 201907L
-#define __cpp_lib_erase_if 201900L
+#define __cpp_lib_erase_if 202002L
 #define __cpp_lib_interpolate 201902L
 #ifdef _GLIBCXX_HAS_GTHREADS
 # define __cpp_lib_jthread 201907L

diff --git a/libstdc++-v3/testsuite/23_containers/deque/erasure.cc b/libstdc++-v3/testsuite/23_containers/deque/erasure.cc
index 31c9e93..328e2fd 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/deque/erasure.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/erasure.cc
@@ -23,7 +23,7 @@
 
 #ifndef __cpp_lib_erase_if
 # error "Feature-test macro for erase_if missing"
-#elif __cpp_lib_erase_if < 201811
+#elif __cpp_lib_erase_if < 202002
 # error "Feature-test macro for erase_if has wrong value"
 #endif
 

diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/erasure.cc b/libstdc++-v3/testsuite/23_containers/forward_list/erasure.cc
index 9f81923..ce321cf 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/forward_list/erasure.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/erasure.cc
@@ -23,7 +23,7 @@
 
 #ifndef __cpp_lib_erase_if
 # error "Feature-test macro for erase_if missing"
-#elif __cpp_lib_erase_if < 201811
+#elif __cpp_lib_erase_if < 202002
 # error "Feature-test macro for erase_if has wrong value"
 #endif
 

diff --git a/libstdc++-v3/testsuite/23_containers/list/erasure.cc b/libstdc++-v3/testsuite/23_containers/list/erasure.cc
index 9f6b30c..2b543d2 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/list/erasure.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/erasure.cc
@@ -23,7 +23,7 @@
 
 #ifndef __cpp_lib_erase_if
 # error "Feature-test macro for erase_if missing"
-#elif __cpp_lib_erase_if < 201811
+#elif __cpp_lib_erase_if < 202002
 # error "Feature-test macro for erase_if has wrong value"
 #endif
 

diff --git a/libstdc++-v3/testsuite/23_containers/map/erasure.cc b/libstdc++-v3/testsuite/23_containers/map/erasure.cc
index 50f4924..4575e19 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/map/erasure.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/erasure.cc
@@ -24,7 +24,7 @@
 
 #ifndef __cpp_lib_erase_if
 # error "Feature-test macro for erase_if missing"
-#elif __cpp_lib_erase_if < 201811
+#elif __cpp_lib_erase_if < 202002
 # error "Feature-test macro for erase_if has wrong value"
 #endif
 

diff --git a/libstdc++-v3/testsuite/23_containers/set/erasure.cc b/libstdc++-v3/testsuite/23_containers/set/erasure.cc
index 4af4c6d..48e70db 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/set/erasure.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/erasure.cc
@@ -23,7 +23,7 @@
 
 #ifndef __cpp_lib_erase_if
 # error "Feature-test macro for erase_if missing"
-#elif __cpp_lib_erase_if < 201811
+#elif __cpp_lib_erase_if < 202002
 # error "Feature-test macro for erase_if has wrong value"
 #endif
 

diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/erasure.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/erasure.cc
index 46ae69b..a5af7f0 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/erasure.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/erasure.cc
@@ -24,7 +24,7 @@
 
 #ifndef __cpp_lib_erase_if
 # error "Feature-test macro for erase_if missing"
-#elif __cpp_lib_erase_if < 201811
+#elif __cpp_lib_erase_if < 202002
 # error "Feature-test macro for erase_if has wrong value"
 #endif
 

diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/erasure.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/erasure.cc
index b3138bf..c129b1b 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/erasure.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/erasure.cc
@@ -23,7 +23,7 @@
 
 #ifndef __cpp_lib_erase_if
 # error "Feature-test macro for erase_if missing"
-#elif __cpp_lib_erase_if < 201811
+#elif __cpp_lib_erase_if < 202002
 # error "Feature-test macro for erase_if has wrong value"
 #endif
 

diff --git a/libstdc++-v3/testsuite/23_containers/vector/erasure.cc b/libstdc++-v3/testsuite/23_containers/vector/erasure.cc
index 470832c..c3fb41f 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/vector/erasure.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/erasure.cc
@@ -23,7 +23,7 @@
 
 #ifndef __cpp_lib_erase_if
 # error "Feature-test macro for erase_if missing"
-#elif __cpp_lib_erase_if < 201811
+#elif __cpp_lib_erase_if < 202002
 # error "Feature-test macro for erase_if has wrong value"
 #endif