diff options
| -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/cpp1z/feat-cxx1z.C | 12 |
3 files changed, 19 insertions, 0 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index e4ba2de..475cd7d 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,8 @@ +2016-10-14 Jason Merrill <jason@redhat.com> + + * c-cppbuiltin.c (c_cpp_builtins): Define __cpp_aggregate_bases + and __cpp_deduction_guides. + 2016-10-13 Jason Merrill <jason@redhat.com> * c-cppbuiltin.c (c_cpp_builtins): Add __cpp_inline_variables. diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c index 06b5aa3..4179a32 100644 --- a/gcc/c-family/c-cppbuiltin.c +++ b/gcc/c-family/c-cppbuiltin.c @@ -936,6 +936,8 @@ c_cpp_builtins (cpp_reader *pfile) cpp_define (pfile, "__cpp_if_constexpr=201606"); cpp_define (pfile, "__cpp_capture_star_this=201603"); cpp_define (pfile, "__cpp_inline_variables=201606"); + cpp_define (pfile, "__cpp_aggregate_bases=201603"); + cpp_define (pfile, "__cpp_deduction_guides=201606"); } if (flag_concepts) /* Use a value smaller than the 201507 specified in diff --git a/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C b/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C index c86dbe2..e023e6a 100644 --- a/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C +++ b/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C @@ -344,6 +344,18 @@ # error "__cpp_hex_float != 201603" #endif +#ifndef __cpp_aggregate_bases +# error "__cpp_aggregate_bases" +#elif __cpp_aggregate_bases != 201603 +# error "__cpp_aggregate_bases != 201603" +#endif + +#ifndef __cpp_deduction_guides +# error "__cpp_deduction_guides" +#elif __cpp_deduction_guides != 201606 +# error "__cpp_deduction_guides != 201606" +#endif + #ifndef __cpp_if_constexpr # error "__cpp_if_constexpr" #elif __cpp_if_constexpr != 201606 |