* c-cppbuiltin.c (c_cpp_builtins): Update __cpp_deduction_guides.

From-SVN: r257700

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 1f536d1b4b08bf8b60350c6cd6eb4295f3ae2849..3a124d0c16176aeb6072368862064a67f0781c7b 100644 (file)
--- 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 0624c0062786362b5da442307970f031cb4126f4..3fc4fa9cd6853bbea535f071f4d77fa60b6df409 100644 (file)
--- 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 b2f046b5c91fb8f1e35d770cf681c1ba659932a1..2ab1b4e3e868d29c5d61cc94b30d6285ab239a90 100644 (file)
--- 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