aboutsummaryrefslogtreecommitdiff
path: root/gcc/c-family
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2018-02-15 13:16:05 -0500
committerJason Merrill <jason@gcc.gnu.org>2018-02-15 13:16:05 -0500
commit883dfe2aef3f7dcf54dabc28538450c149c4e61c (patch)
treedeaa0ab658eca54b8e7455f5b5d103022411b6c0 /gcc/c-family
parent4912defbcc3cc0d3a3af9673e413d45731c94da2 (diff)
downloadgcc-883dfe2aef3f7dcf54dabc28538450c149c4e61c.zip
gcc-883dfe2aef3f7dcf54dabc28538450c149c4e61c.tar.gz
gcc-883dfe2aef3f7dcf54dabc28538450c149c4e61c.tar.bz2
* c-cppbuiltin.c (c_cpp_builtins): Update __cpp_deduction_guides.
From-SVN: r257700
Diffstat (limited to 'gcc/c-family')
-rw-r--r--gcc/c-family/ChangeLog4
-rw-r--r--gcc/c-family/c-cppbuiltin.c2
2 files changed, 5 insertions, 1 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");