c-cppbuiltin.c (c_cpp_builtins): Update __cpp_inheriting_constructors.

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

From-SVN: r241766

gcc/c-family/ChangeLog

 2016-11-01  Jason Merrill  <jason@redhat.com>
 
+	* c-cppbuiltin.c (c_cpp_builtins): Update
+	__cpp_inheriting_constructors.
+
 	* c.opt (-fnew-inheriting-ctors): New.
 	* c-opts.c: Default to on for ABI 11+.
 

gcc/c-family/c-cppbuiltin.c

@@ -904,7 +904,10 @@ c_cpp_builtins (cpp_reader *pfile)
 	  cpp_define (pfile, "__cpp_initializer_lists=200806");
 	  cpp_define (pfile, "__cpp_delegating_constructors=200604");
 	  cpp_define (pfile, "__cpp_nsdmi=200809");
-	  cpp_define (pfile, "__cpp_inheriting_constructors=200802");
+	  if (!flag_new_inheriting_ctors)
+	    cpp_define (pfile, "__cpp_inheriting_constructors=200802");
+	  else
+	    cpp_define (pfile, "__cpp_inheriting_constructors=201606");
 	  cpp_define (pfile, "__cpp_ref_qualifiers=200710");
 	  cpp_define (pfile, "__cpp_alias_templates=200704");
 	}

gcc/testsuite/g++.dg/cpp1y/feat-cxx11.C

@@ -109,8 +109,8 @@
 
 #ifndef __cpp_inheriting_constructors
 #  error "__cpp_inheriting_constructors"
-#elif  __cpp_inheriting_constructors!= 200802
-#  error "__cpp_inheriting_constructors != 200802"
+#elif  __cpp_inheriting_constructors!= 201606
+#  error "__cpp_inheriting_constructors != 201606"
 #endif
 
 #ifndef __cpp_ref_qualifiers

gcc/testsuite/g++.dg/cpp1y/feat-cxx14.C

@@ -102,8 +102,8 @@
 
 #ifndef __cpp_inheriting_constructors
 #  error "__cpp_inheriting_constructors"
-#elif  __cpp_inheriting_constructors!= 200802
-#  error "__cpp_inheriting_constructors != 200802"
+#elif  __cpp_inheriting_constructors!= 201606
+#  error "__cpp_inheriting_constructors != 201606"
 #endif
 
 #ifndef __cpp_ref_qualifiers

gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C

@@ -90,8 +90,8 @@
 
 #ifndef __cpp_inheriting_constructors
 #  error "__cpp_inheriting_constructors"
-#elif  __cpp_inheriting_constructors!= 200802
-#  error "__cpp_inheriting_constructors != 200802"
+#elif  __cpp_inheriting_constructors!= 201606
+#  error "__cpp_inheriting_constructors != 201606"
 #endif
 
 #ifndef __cpp_ref_qualifiers