* c-cppbuiltin.c (c_cpp_builtins): Correct __cpp_inheriting_constructors.

From-SVN: r241830

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 2d8430da2be9c7f56c40d20796f0904917c04ac0..e9a8f8bbc6488180ed50a4d50b5632bfd20a987a 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-03  Jason Merrill  <jason@redhat.com>
+
+       * c-cppbuiltin.c (c_cpp_builtins): Correct
+       __cpp_inheriting_constructors.
+
 2016-11-01  Jason Merrill  <jason@redhat.com>
 
        * c-cppbuiltin.c (c_cpp_builtins): Update

diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
index f7959b2b143d028902e2249addf968bb1fd167ea..e40fa6ff9dc442afcd6e7cd34fcde99fccface60 100644 (file)
--- a/gcc/c-family/c-cppbuiltin.c
+++ b/gcc/c-family/c-cppbuiltin.c
@@ -907,7 +907,7 @@ c_cpp_builtins (cpp_reader *pfile)
          if (!flag_new_inheriting_ctors)
            cpp_define (pfile, "__cpp_inheriting_constructors=200802");
          else
-           cpp_define (pfile, "__cpp_inheriting_constructors=201606");
+           cpp_define (pfile, "__cpp_inheriting_constructors=201511");
          cpp_define (pfile, "__cpp_ref_qualifiers=200710");
          cpp_define (pfile, "__cpp_alias_templates=200704");
        }

diff --git a/gcc/testsuite/g++.dg/cpp1y/feat-cxx11.C b/gcc/testsuite/g++.dg/cpp1y/feat-cxx11.C
index 0e7ee840da15cff44a99bf5acb27625262668557..2f3b01efc38b7e6ebf8495420ec1d82dfc04a44d 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp1y/feat-cxx11.C
+++ b/gcc/testsuite/g++.dg/cpp1y/feat-cxx11.C
@@ -109,8 +109,8 @@
 
 #ifndef __cpp_inheriting_constructors
 #  error "__cpp_inheriting_constructors"
-#elif  __cpp_inheriting_constructors!= 201606
-#  error "__cpp_inheriting_constructors != 201606"
+#elif  __cpp_inheriting_constructors!= 201511
+#  error "__cpp_inheriting_constructors != 201511"
 #endif
 
 #ifndef __cpp_ref_qualifiers

diff --git a/gcc/testsuite/g++.dg/cpp1y/feat-cxx14.C b/gcc/testsuite/g++.dg/cpp1y/feat-cxx14.C
index d03066b709e93821f029e9384a6db7a4d9f9ee4b..3b141ef67c452bf5d9bfb98f7e97526b1c74c1ea 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp1y/feat-cxx14.C
+++ b/gcc/testsuite/g++.dg/cpp1y/feat-cxx14.C
@@ -102,8 +102,8 @@
 
 #ifndef __cpp_inheriting_constructors
 #  error "__cpp_inheriting_constructors"
-#elif  __cpp_inheriting_constructors!= 201606
-#  error "__cpp_inheriting_constructors != 201606"
+#elif  __cpp_inheriting_constructors!= 201511
+#  error "__cpp_inheriting_constructors != 201511"
 #endif
 
 #ifndef __cpp_ref_qualifiers

diff --git a/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C b/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C
index 21321ea4586ebbd6127046a1b914942168e4d466..6ac66e07ce142e57fc54ff8c24541fa164e2166a 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C
+++ b/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C
@@ -90,8 +90,8 @@
 
 #ifndef __cpp_inheriting_constructors
 #  error "__cpp_inheriting_constructors"
-#elif  __cpp_inheriting_constructors!= 201606
-#  error "__cpp_inheriting_constructors != 201606"
+#elif  __cpp_inheriting_constructors!= 201511
+#  error "__cpp_inheriting_constructors != 201511"
 #endif
 
 #ifndef __cpp_ref_qualifiers