decl.c (grokdeclarator): Use current_class_name.

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

	* decl.c (grokdeclarator): Use current_class_name.

From-SVN: r174125

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8c47e0f98cce286bad6da2dc833fba3c2cce036c..351b07260eb2990d23602a408b4a34c121eace4b 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 234daafb8a12e8592c78a2dc9b6fa19f87b07215..d87a837293065aefe2ecafa8638453039f2c96d1 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",