OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
From-SVN: r241830
This commit is contained in:
Jason Merrill 2016-11-03 15:52:19 -04:00 committed by Jason Merrill
parent d3d3f1afce
commit b302001e3a
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/c-family/ChangeLog
View File

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

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

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

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!= 201606
# error "__cpp_inheriting_constructors != 201606"
#elif __cpp_inheriting_constructors!= 201511
# error "__cpp_inheriting_constructors != 201511"
#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!= 201606
# error "__cpp_inheriting_constructors != 201606"
#elif __cpp_inheriting_constructors!= 201511
# error "__cpp_inheriting_constructors != 201511"
#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!= 201606
# error "__cpp_inheriting_constructors != 201606"
#elif __cpp_inheriting_constructors!= 201511
# error "__cpp_inheriting_constructors != 201511"
#endif
#ifndef __cpp_ref_qualifiers