From 24bc7bf417e407e9fbfacffcd1b61a619f4463f8 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 20 Oct 2016 09:49:28 -0400 Subject: [PATCH] * c-cppbuiltin.c (c_cpp_builtins): Update __cpp_concepts value. From-SVN: r241376 --- gcc/c-family/ChangeLog | 4 ++++ gcc/c-family/c-cppbuiltin.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 0ef8ef7aad9..ae399ea3142 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,7 @@ +2016-10-20 Jason Merrill + + * c-cppbuiltin.c (c_cpp_builtins): Update __cpp_concepts value. + 2016-10-19 Bernd Edlinger * c-common.c (c_common_truthvalue_conversion): Warn only for signed diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c index 4179a32f356..7d689a9c0ff 100644 --- a/gcc/c-family/c-cppbuiltin.c +++ b/gcc/c-family/c-cppbuiltin.c @@ -940,9 +940,7 @@ c_cpp_builtins (cpp_reader *pfile) cpp_define (pfile, "__cpp_deduction_guides=201606"); } if (flag_concepts) - /* Use a value smaller than the 201507 specified in - the TS, since we don't yet support extended auto. */ - cpp_define (pfile, "__cpp_concepts=201500"); + cpp_define (pfile, "__cpp_concepts=201507"); if (flag_tm) /* Use a value smaller than the 201505 specified in the TS, since we don't yet support atomic_cancel. */ -- 2.30.2