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

From-SVN: r234508

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index c1188d7e5c0c990a3165c673e69ad7f30e3d4f19..26b1dabd6eed8010634f5aa47b0330ea073ef0b4 100644 (file)
--- 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 ee953ca44c82abf9f79c3551dd61685957b36ac5..94523b8fc7c121aeecfae14c4bb3a35f9cab37d7 100644 (file)
--- 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 67f75a725482aa386c13c7c0013569d9ef5edf3c..397b9a899573cab7b704f672a10ee94a1fa91850 100644 (file)
--- 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 d9dbf6283a28aeba5c0111f82b6b77a0560561aa..fa59f90fa8923c606f059a6feee67a840df7817f 100644 (file)
--- 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 3dc358f4e4bf8ab23cfd4a49bf390a9f7c3f89ff..74c6f2978dfd97f55369d432a31c67123b94a787 100644 (file)
--- 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