From 9aa36ae5221cc5eab54c9ccd3502237ae9a2ff03 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 22 Apr 2016 12:16:27 -0400 Subject: [PATCH] * c-cppbuiltin.c (c_cpp_builtins): Fix __cpp_range_based_for. From-SVN: r235371 --- gcc/c-family/ChangeLog | 4 ++++ gcc/c-family/c-cppbuiltin.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index fc772147ae8..085d16ab689 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,7 @@ +2016-04-22 Jason Merrill + + * c-cppbuiltin.c (c_cpp_builtins): Fix __cpp_range_based_for. + 2016-04-20 Ilya Verbin PR c++/69363 diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c index 94523b8fc7c..408ad4747a3 100644 --- a/gcc/c-family/c-cppbuiltin.c +++ b/gcc/c-family/c-cppbuiltin.c @@ -841,7 +841,8 @@ c_cpp_builtins (cpp_reader *pfile) cpp_define (pfile, "__cpp_lambdas=200907"); if (cxx_dialect == cxx11) cpp_define (pfile, "__cpp_constexpr=200704"); - cpp_define (pfile, "__cpp_range_based_for=201603"); + if (cxx_dialect <= cxx14) + cpp_define (pfile, "__cpp_range_based_for=200907"); if (cxx_dialect <= cxx14) cpp_define (pfile, "__cpp_static_assert=200410"); cpp_define (pfile, "__cpp_decltype=200707"); @@ -877,6 +878,7 @@ c_cpp_builtins (cpp_reader *pfile) cpp_define (pfile, "__cpp_nested_namespace_definitions=201411"); cpp_define (pfile, "__cpp_fold_expressions=201603"); cpp_define (pfile, "__cpp_nontype_template_args=201411"); + cpp_define (pfile, "__cpp_range_based_for=201603"); } if (flag_concepts) /* Use a value smaller than the 201507 specified in -- 2.30.2