From: Jason Merrill Date: Tue, 13 Nov 2018 04:32:25 +0000 (-0500) Subject: Change __cpp_explicit_bool to __cpp_conditional_explicit. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e4bd6d5e1f4496e06ac2d08effa977b191b91a54;p=gcc.git Change __cpp_explicit_bool to __cpp_conditional_explicit. People objected to the old macro name as unclear, so it was changed. * c-cppbuiltin.c (c_cpp_builtins): Change __cpp_explicit_bool to __cpp_conditional_explicit. From-SVN: r266050 --- diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 6ce25c97783..42bb5ca450b 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,8 @@ +2018-11-12 Jason Merrill + + * c-cppbuiltin.c (c_cpp_builtins): Change __cpp_explicit_bool to + __cpp_conditional_explicit. + 2018-11-09 Martin Sebor PR middle-end/81824 diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c index e7f4c669056..8dd62158b62 100644 --- a/gcc/c-family/c-cppbuiltin.c +++ b/gcc/c-family/c-cppbuiltin.c @@ -978,7 +978,7 @@ c_cpp_builtins (cpp_reader *pfile) if (cxx_dialect > cxx17) { /* Set feature test macros for C++2a. */ - cpp_define (pfile, "__cpp_explicit_bool=201806"); + cpp_define (pfile, "__cpp_conditional_explicit=201806"); cpp_define (pfile, "__cpp_nontype_template_parameter_class=201806"); } if (flag_concepts) diff --git a/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C b/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C index faed6697382..4289bfcfa52 100644 --- a/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C +++ b/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C @@ -418,6 +418,10 @@ // C++20 features +#if __cpp_conditional_explicit != 201806 +# error "__cpp_conditional_explicit != 201806" +#endif + #if __cpp_nontype_template_parameter_class != 201806 # error "__cpp_nontype_template_parameter_class != 201806" #endif