From: Jason Merrill <jason@redhat.com>
Date: Thu, 3 Nov 2016 19:52:19 +0000 (-0400)
Subject: * c-cppbuiltin.c (c_cpp_builtins): Correct __cpp_inheriting_constructors.
X-Git-Tag: basepoints/gcc-8~3396
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b302001e3a04e8d2911989816c8907bf3e5c2389;p=thirdparty%2Fgcc.git

* 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 2d8430da2be9..e9a8f8bbc648 100644
--- 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 f7959b2b143d..e40fa6ff9dc4 100644
--- 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 0e7ee840da15..2f3b01efc38b 100644
--- 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 d03066b709e9..3b141ef67c45 100644
--- 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 21321ea4586e..6ac66e07ce14 100644
--- 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