From: Jonathan Wakely Date: Fri, 11 Jan 2019 23:40:58 +0000 (+0000) Subject: Fix location of __cpp_lib_erase_if macro X-Git-Tag: upstream/12.2.0~26834 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e334d7a702b21feafc8420495f7e91f22336e101;p=platform%2Fupstream%2Fgcc.git Fix location of __cpp_lib_erase_if macro This macro should only be defined for C++2a, not C++17. * include/std/version (__cpp_lib_erase_if): Move to C++20 group. From-SVN: r267863 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index af7cf3e..8bf6884 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2019-01-11 Jonathan Wakely + + * include/std/version (__cpp_lib_erase_if): Move to C++20 group. + 2019-01-11 Jakub Jelinek * include/std/type_traits (__cpp_lib_is_constant_evaluated): Define. diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version index 903b75b..e9a1f12 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -96,7 +96,6 @@ #define __cpp_lib_clamp 201603 #define __cpp_lib_constexpr_char_traits 201611 #define __cpp_lib_enable_shared_from_this 201603 -#define __cpp_lib_erase_if 201900L #define __cpp_lib_filesystem 201703 #define __cpp_lib_gcd 201606 #define __cpp_lib_gcd_lcm 201606 @@ -142,6 +141,7 @@ #if __cplusplus > 201703L // c++2a +#define __cpp_lib_erase_if 201900L #ifdef _GLIBCXX_HAVE_BUILTIN_IS_CONSTANT_EVALUATED # define __cpp_lib_is_constant_evaluated 201811L #endif