diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/c-family/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/c-family/c-cppbuiltin.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 6ce25c9..42bb5ca 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,8 @@ +2018-11-12 Jason Merrill <jason@redhat.com> + + * c-cppbuiltin.c (c_cpp_builtins): Change __cpp_explicit_bool to + __cpp_conditional_explicit. + 2018-11-09 Martin Sebor <msebor@redhat.com> PR middle-end/81824 diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c index e7f4c66..8dd6215 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 faed669..4289bfc 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 |