Message ID | 20200215104221.GA1464310@redhat.com |
---|---|
State | New |
Headers | show |
Series | libstdc++: Update __cpp_lib_erase_if macro (P1115R3) | expand |
diff --git a/libstdc++-v3/include/bits/erase_if.h b/libstdc++-v3/include/bits/erase_if.h index 2641fe63ba3..dc5e6ae584f 100644 --- 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 efe04dbbb7c..07e2c69d02d 100644 --- 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 8eb1ad150a7..439ef6b380c 100644 --- 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 1fb51a5abb4..7b3d3c2e888 100644 --- 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 6a3b61f8622..a95ef4dd541 100644 --- 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 2a7b4c0f629..6f587a82a09 100644 --- 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 d8a97767453..8a4affa60a0 100644 --- 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 31c9e93de30..328e2fdbefa 100644 --- 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 9f81923ac75..ce321cf0c59 100644 --- 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 9f6b30caea5..2b543d2f321 100644 --- 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 50f49241234..4575e191267 100644 --- 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 4af4c6d739d..48e70db814f 100644 --- 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 46ae69b3b97..a5af7f02d4f 100644 --- 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 b3138bfe5b1..c129b1bbfd3 100644 --- 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 470832c71aa..c3fb41f576b 100644 --- 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