git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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

From-SVN: r241766
This commit is contained in:
Jason Merrill 2016-11-01 22:10:38 -04:00 committed by Jason Merrill
parent 31f7f784fe
commit 2bc78e3ce5
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/c-family/ChangeLog
View File

@ -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+.

5
gcc/c-family/c-cppbuiltin.c
View File

@ -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");
}

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

@ -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

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

@ -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

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

@ -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