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 8e248703430a02d04aec8408ab453e76e62a66d9..3c7720579c4925e67843ef0219c8963e80d2fc37 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,21 @@
+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()

diff --git a/libstdc++-v3/include/bits/erase_if.h b/libstdc++-v3/include/bits/erase_if.h
index 2641fe63ba39d7b705593e5f029512d142220e33..dc5e6ae584f2d191df608454617c1258741921ae 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 efe04dbbb7c60993bef0295f90c1ed36e910c440..07e2c69d02de856de7bf01135bbb7a058dce4932 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 8eb1ad150a7dd4f666bc0b09d8f5df804f2f703a..439ef6b380cbacf18f6cf5fd34bf68d215affa31 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 1fb51a5abb42ca50cc7d51516efacd9e1e0c23f1..7b3d3c2e8888cd1282988077806bfc3ae66aabec 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 6a3b61f86225ed687e618fa747214f0f94f8e37d..a95ef4dd5418f18cec9290b5c3298cc1d34c6694 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 2a7b4c0f6294cffa75a7077c1285483ecbe6e3dd..6f587a82a09041cd3cbd2cc20c02e7ddcabf489c 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 d8a97767453542bc03cb6457c52c762994395836..8a4affa60a0f55caeb32580a118fb59325ff2741 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 31c9e93de30a14272495c05a4b0e8aa29dce6c34..328e2fdbefaba37fa273e5a6187ef8558056997a 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 9f81923ac75c71d89b5a7808d691392d111c7a91..ce321cf0c597f7c4891cd6b6a7c33b874e9d77d4 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 9f6b30caea5d7143937ba6a5c0ee7cd6b59ff400..2b543d2f321673865cacd744e03a63fea6e7feff 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 50f49241234723aed01b2613fd8d6bcb1afd048a..4575e1912678b69782e845ce2811e5d61ec26036 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 4af4c6d739de20914c3e6898477d4931b5878705..48e70db814fb7b642fde13c3be298e623ff88d75 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 46ae69b3b9738681957240c9131ceb3cc24dd6aa..a5af7f02d4f5d67366e00e76526f6ad543647315 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 b3138bfe5b17b450076f6c64abdc05ccb546c6ed..c129b1bbfd3b16e82300a01859f8f5016372bcfa 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 470832c71aacfe33bcb7924aece782a73fd939e9..c3fb41f576b38da70851a6c5d375b33021dbff78 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