From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 28 Mar 2016 17:22:49 +0000 (+0000)
Subject: 	* c-cppbuiltin.c (c_cpp_builtins): Update __cpp_range_based_for.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3ae889fad4545a8226098988e24c3eeba34f0d0;p=thirdparty%2Fgcc.git

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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@234508 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index c1188d7e5c0c..26b1dabd6eed 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,7 @@
+2016-03-28  Jason Merrill  <jason@redhat.com>
+
+	* c-cppbuiltin.c (c_cpp_builtins): Update __cpp_range_based_for.
+
 2016-03-23  Marek Polacek  <polacek@redhat.com>
 
 	PR c++/69884
diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
index ee953ca44c82..94523b8fc7c1 100644
--- a/gcc/c-family/c-cppbuiltin.c
+++ b/gcc/c-family/c-cppbuiltin.c
@@ -841,7 +841,7 @@ 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=200907");
+	  cpp_define (pfile, "__cpp_range_based_for=201603");
 	  if (cxx_dialect <= cxx14)
 	    cpp_define (pfile, "__cpp_static_assert=200410");
 	  cpp_define (pfile, "__cpp_decltype=200707");
diff --git a/gcc/testsuite/g++.dg/cpp1y/feat-cxx11.C b/gcc/testsuite/g++.dg/cpp1y/feat-cxx11.C
index 67f75a725482..397b9a899573 100644
--- a/gcc/testsuite/g++.dg/cpp1y/feat-cxx11.C
+++ b/gcc/testsuite/g++.dg/cpp1y/feat-cxx11.C
@@ -55,8 +55,8 @@
 
 #ifndef __cpp_range_based_for
 #  error "__cpp_range_based_for"
-#elif __cpp_range_based_for != 200907
-#  error "__cpp_range_based_for != 200907"
+#elif __cpp_range_based_for < 200907
+#  error "__cpp_range_based_for < 200907"
 #endif
 
 #ifndef __cpp_static_assert
diff --git a/gcc/testsuite/g++.dg/cpp1y/feat-cxx14.C b/gcc/testsuite/g++.dg/cpp1y/feat-cxx14.C
index d9dbf6283a28..fa59f90fa892 100644
--- a/gcc/testsuite/g++.dg/cpp1y/feat-cxx14.C
+++ b/gcc/testsuite/g++.dg/cpp1y/feat-cxx14.C
@@ -48,8 +48,8 @@
 
 #ifndef __cpp_range_based_for
 #  error "__cpp_range_based_for"
-#elif __cpp_range_based_for != 200907
-#  error "__cpp_range_based_for != 200907"
+#elif __cpp_range_based_for < 200907
+#  error "__cpp_range_based_for < 200907"
 #endif
 
 #ifndef __cpp_static_assert
diff --git a/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C b/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C
index 3dc358f4e4bf..74c6f2978dfd 100644
--- a/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C
+++ b/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C
@@ -42,8 +42,8 @@
 
 #ifndef __cpp_range_based_for
 #  error "__cpp_range_based_for"
-#elif __cpp_range_based_for != 200907
-#  error "__cpp_range_based_for != 200907"
+#elif __cpp_range_based_for != 201603
+#  error "__cpp_range_based_for != 201603"
 #endif
 
 #ifndef __cpp_decltype