2011-05-24 Paolo Carlini <paolo.carlini@oracle.com>

	* decl.c (grokdeclarator): Use current_class_name.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@174125 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8c47e0f..351b072 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-24  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * decl.c (grokdeclarator): Use current_class_name.
+
 2011-05-24  Joseph Myers  <joseph@codesourcery.com>
 
        * Make-lang.in (GXX_OBJS): Remove prefix.o.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 234daaf..d87a837 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -9910,7 +9910,7 @@ grokdeclarator (const cp_declarator *declarator,
               instantiation made the field's type be incomplete.  */
            if (current_class_type
                && TYPE_NAME (current_class_type)
-               && IDENTIFIER_TEMPLATE (TYPE_IDENTIFIER (current_class_type))
+               && IDENTIFIER_TEMPLATE (current_class_name)
                && declspecs->type
                && declspecs->type == type)
              error ("  in instantiation of template %qT",