diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2005-02-23 05:30:48 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2005-02-23 05:30:48 +0000 |
| commit | 744b12b65f6923a713593f404f97384c6093dd94 (patch) | |
| tree | b003a007ec3edf4d8323134ca4e5d3a88c20f95d /gcc/cp/parser.c | |
| parent | 90c1d75a9bb8e25aa963da02f9c91f5f40143be1 (diff) | |
| download | gcc-744b12b65f6923a713593f404f97384c6093dd94.zip gcc-744b12b65f6923a713593f404f97384c6093dd94.tar.gz gcc-744b12b65f6923a713593f404f97384c6093dd94.tar.bz2 | |
re PR c++/19991 (Enum not accepted in array-size)
PR c++/19991
* init.c (integral_constant_value): Iterate if the value of a decl
is itself a constant.
PR c++/20152
* parser.c (cp_parser_class_head): Check for redefintions here.
* semantics.c (begin_class_definition): Not here.
PR c++/20153
* decl2.c (build_anon_union_vars): Add type parameter.
(finish_anon_union): Pass it.
PR c++/20148
* error.c (dump_expr): Do not print the body of a BIND_EXPR.
Handle STATEMENT_LIST.
PR c++/19991
* g++.dg/parse/constant7.C: New test.
PR c++/20152
* g++.dg/parse/error27.C: New test.
* g++.dg/template/qualttp15.C: Adjust error markers.
* g++.old-deja/g++.other/struct1.C: Likewise.
PR c++/20153
* g++.dg/template/error17.C: New test.
PR c++/20148
* g++.dg/parser/error26.C: New test.
From-SVN: r95438
Diffstat (limited to 'gcc/cp/parser.c')
| -rw-r--r-- | gcc/cp/parser.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index b52ba95..765991f 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -12842,9 +12842,17 @@ cp_parser_class_head (cp_parser* parser, CLASSTYPE_DECLARED_CLASS (type) = (class_key == class_type); cp_parser_check_class_key (class_key, type); + /* If this type was already complete, and we see another definition, + that's an error. */ + if (type != error_mark_node && COMPLETE_TYPE_P (type)) + { + error ("redefinition of %q#T", type); + cp_error_at ("previous definition of %q#T", type); + type = error_mark_node; + } + /* We will have entered the scope containing the class; the names of - base classes should be looked up in that context. For example, - given: + base classes should be looked up in that context. For example: struct A { struct B {}; struct C; }; struct A::C : B {}; |