re PR c++/18698 (Error message using "using" for code not using "using" ;-))

        PR c++/18698
        * decl2.c (grokfield): Only try to treat the decl as an access
        declaration if the scope is a class.

From-SVN: r115095

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c9eb4b9d7d453eb72b9e90729850a15f0eac9eb3..ad5b0553f283fd2fdcfab505c5e659ea26cf56e8 100644 (file)
--- 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 0a12a3806585722459f20efbb35ab3fedd048ada..620141ac0b017127b97878e6675d1d3ef766afc2 100644 (file)
--- 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 (file)
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 }