diff options
| author | Jason Merrill <jason@redhat.com> | 2018-02-15 13:16:05 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2018-02-15 13:16:05 -0500 |
| commit | 883dfe2aef3f7dcf54dabc28538450c149c4e61c (patch) | |
| tree | deaa0ab658eca54b8e7455f5b5d103022411b6c0 | |
| parent | 4912defbcc3cc0d3a3af9673e413d45731c94da2 (diff) | |
| download | gcc-883dfe2aef3f7dcf54dabc28538450c149c4e61c.zip gcc-883dfe2aef3f7dcf54dabc28538450c149c4e61c.tar.gz gcc-883dfe2aef3f7dcf54dabc28538450c149c4e61c.tar.bz2 | |
* c-cppbuiltin.c (c_cpp_builtins): Update __cpp_deduction_guides.
From-SVN: r257700
| -rw-r--r-- | gcc/c-family/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/c-family/c-cppbuiltin.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 1f536d1..3a124d0 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,7 @@ +2018-02-15 Jason Merrill <jason@redhat.com> + + * c-cppbuiltin.c (c_cpp_builtins): Update __cpp_deduction_guides. + 2018-02-09 Nathan Sidwell <nathan@acm.org> PR c/84293 diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c index 0624c00..3fc4fa9 100644 --- a/gcc/c-family/c-cppbuiltin.c +++ b/gcc/c-family/c-cppbuiltin.c @@ -970,7 +970,7 @@ c_cpp_builtins (cpp_reader *pfile) 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"); + cpp_define (pfile, "__cpp_deduction_guides=201611"); cpp_define (pfile, "__cpp_noexcept_function_type=201510"); cpp_define (pfile, "__cpp_template_auto=201606"); cpp_define (pfile, "__cpp_structured_bindings=201606"); diff --git a/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C b/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C index b2f046b..2ab1b4e 100644 --- a/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C +++ b/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C @@ -358,8 +358,8 @@ #ifndef __cpp_deduction_guides # error "__cpp_deduction_guides" -#elif __cpp_deduction_guides != 201606 -# error "__cpp_deduction_guides != 201606" +#elif __cpp_deduction_guides != 201611 +# error "__cpp_deduction_guides != 201611" #endif #ifndef __cpp_if_constexpr |