diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/access10.C | 13 |
3 files changed, 21 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c9eb4b9..ad5b055 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2006-06-30 Jason Merrill <jason@redhat.com> + + PR c++/18698 + * decl2.c (grokfield): Only try to treat the decl as an access + declaration if the scope is a class. + 2006-06-29 Jason Merrill <jason@redhat.com> PR c++/26905 diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 0a12a38..620141a 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -769,6 +769,8 @@ grokfield (const cp_declarator *declarator, if (!declspecs->any_specifiers_p && declarator->kind == cdk_id && declarator->u.id.qualifying_scope + && TYPE_P (declarator->u.id.qualifying_scope) + && IS_AGGR_TYPE (declarator->u.id.qualifying_scope) && TREE_CODE (declarator->u.id.unqualified_name) == IDENTIFIER_NODE) /* Access declaration */ return do_class_using_decl (declarator->u.id.qualifying_scope, diff --git a/gcc/testsuite/g++.dg/parse/access10.C b/gcc/testsuite/g++.dg/parse/access10.C new file mode 100644 index 0000000..4142f15 --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/access10.C @@ -0,0 +1,13 @@ +// PR c++/18698 +// The compiler was giving an error message for invalid syntax +// that irrelevantly talked about using-declarations. + +template<int> struct A +{ + ::A~(); // { dg-bogus "using-declaration" } +}; + +// Instead of the bogus error we get 3 separate errors. +// { dg-error "no type" "" { target *-*-* } 5 } +// { dg-error "::" "" { target *-*-* } 5 } +// { dg-error "~" "" { target *-*-* } 5 } |