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

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

From-SVN: r241766

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index efec6e167380b002f4f792259b3383c430ebe4eb..2d8430da2be9c7f56c40d20796f0904917c04ac0 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,5 +1,8 @@
 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+.
 

diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
index 7d689a9c0ffd2c1b5f4d559e0a9b05aec4dfef3c..f7959b2b143d028902e2249addf968bb1fd167ea 100644 (file)
--- a/gcc/c-family/c-cppbuiltin.c
+++ b/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");
        }

diff --git a/gcc/testsuite/g++.dg/cpp1y/feat-cxx11.C b/gcc/testsuite/g++.dg/cpp1y/feat-cxx11.C
index 6928d6bcbd872dfbed41d953ff23b2e8a215f23f..0e7ee840da15cff44a99bf5acb27625262668557 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!= 200802
-#  error "__cpp_inheriting_constructors != 200802"
+#elif  __cpp_inheriting_constructors!= 201606
+#  error "__cpp_inheriting_constructors != 201606"
 #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 dc30a9b3cf849f9c9a84986fff2e2fb96a227e45..d03066b709e93821f029e9384a6db7a4d9f9ee4b 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!= 200802
-#  error "__cpp_inheriting_constructors != 200802"
+#elif  __cpp_inheriting_constructors!= 201606
+#  error "__cpp_inheriting_constructors != 201606"
 #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 e023e6a622df6520247c2717ef5cded3cb619eb0..21321ea4586ebbd6127046a1b914942168e4d466 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!= 200802
-#  error "__cpp_inheriting_constructors != 200802"
+#elif  __cpp_inheriting_constructors!= 201606
+#  error "__cpp_inheriting_constructors != 201606"
 #endif
 
 #ifndef __cpp_ref_qualifiers