aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2016-10-20 09:49:28 -0400
committerJason Merrill <jason@gcc.gnu.org>2016-10-20 09:49:28 -0400
commit24bc7bf417e407e9fbfacffcd1b61a619f4463f8 (patch)
tree5c890dda8ac72ddd1c1192efd6c405508039f24d /gcc
parent916de0338db83c16c07108f35f1748daf3830d7f (diff)
downloadgcc-24bc7bf417e407e9fbfacffcd1b61a619f4463f8.zip
gcc-24bc7bf417e407e9fbfacffcd1b61a619f4463f8.tar.gz
gcc-24bc7bf417e407e9fbfacffcd1b61a619f4463f8.tar.bz2
* c-cppbuiltin.c (c_cpp_builtins): Update __cpp_concepts value.
From-SVN: r241376
Diffstat (limited to 'gcc')
-rw-r--r--gcc/c-family/ChangeLog4
-rw-r--r--gcc/c-family/c-cppbuiltin.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 0ef8ef7..ae399ea 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,7 @@
+2016-10-20 Jason Merrill <jason@redhat.com>
+
+ * c-cppbuiltin.c (c_cpp_builtins): Update __cpp_concepts value.
+
2016-10-19 Bernd Edlinger <bernd.edlinger@hotmail.de>
* 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 4179a32..7d689a9 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. */