From 7f9faf5e703dcc04ddf7dd8136095f3d1fbbed33 Mon Sep 17 00:00:00 2001 From: Lee Millward Date: Wed, 29 Nov 2006 15:19:39 +0000 Subject: 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 --- gcc/testsuite/g++.old-deja/g++.bugs/900121_05.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gcc/testsuite/g++.old-deja/g++.bugs') 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 8dbae5df5b6..62db5b343af 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; }; -- cgit v1.2.1