From 883dfe2aef3f7dcf54dabc28538450c149c4e61c Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 15 Feb 2018 13:16:05 -0500 Subject: [PATCH] * c-cppbuiltin.c (c_cpp_builtins): Update __cpp_deduction_guides. From-SVN: r257700 --- gcc/c-family/ChangeLog | 4 ++++ gcc/c-family/c-cppbuiltin.c | 2 +- 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 1f536d1b4b0..3a124d0c161 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,7 @@ +2018-02-15 Jason Merrill + + * c-cppbuiltin.c (c_cpp_builtins): Update __cpp_deduction_guides. + 2018-02-09 Nathan Sidwell PR c/84293 diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c index 0624c006278..3fc4fa9cd68 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 b2f046b5c91..2ab1b4e3e86 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 -- 2.30.2