aboutsummaryrefslogtreecommitdiff
path: root/gcc/testsuite/g++.old-deja
diff options
context:
space:
mode:
authorLee Millward <lee.millward@codesourcery.com>2006-11-29 15:19:39 +0000
committerLee Millward <lmillward@gcc.gnu.org>2006-11-29 15:19:39 +0000
commit7f9faf5e703dcc04ddf7dd8136095f3d1fbbed33 (patch)
tree8dfe031c7bde6e8643739d129b93e39020aca30e /gcc/testsuite/g++.old-deja
parent8b65a354f0a738cf9e1bfe507ce146ca56b518bc (diff)
downloadgcc-7f9faf5e703dcc04ddf7dd8136095f3d1fbbed33.zip
gcc-7f9faf5e703dcc04ddf7dd8136095f3d1fbbed33.tar.gz
gcc-7f9faf5e703dcc04ddf7dd8136095f3d1fbbed33.tar.bz2
re PR c++/29022 (ICE using operator int in invalid class hierarchy)
PR c++/29022 * parser.c (cp_parser_class_head): Move processing of any base classes to... (cp_parser_class_specifier) ...here. Take an extra tree* parameter for any base classes. Only process them if the opening brace was found. * g++.dg/inherit/virtual2.C: New test. * g++.dg/inherit/virtual3.C: Likewise. * g++.old-deja/g++.bugs/900121_05.C: Adjust error markers. * g++.dg/inherit/error2.C: Likewise. * g++.dg/template/instantiate1.C: Likewise. From-SVN: r119318
Diffstat (limited to 'gcc/testsuite/g++.old-deja')
-rw-r--r--gcc/testsuite/g++.old-deja/g++.bugs/900121_05.C2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/testsuite/g++.old-deja/g++.bugs/900121_05.C b/gcc/testsuite/g++.old-deja/g++.bugs/900121_05.C
index 8dbae5df..62db5b3 100644
--- a/gcc/testsuite/g++.old-deja/g++.bugs/900121_05.C
+++ b/gcc/testsuite/g++.old-deja/g++.bugs/900121_05.C
@@ -24,7 +24,7 @@ union u1 {
int u1_member_1;
};
-struct s1 : public u1 { /* { dg-error "" } base class is a union */
+struct s1 : public u1 { /* { dg-error "base type" } */
int s1_member_0;
};