diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2011-05-24 17:33:22 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2011-05-24 17:33:22 +0000 |
| commit | e857ea62d4e2c9a8485ee17c77df8a9fece13e82 (patch) | |
| tree | de69eb9eb0f917cb1184fc774f5327374f3436e5 | |
| parent | 8c5fdaaefc5b028fed17e9cfca25f30867b1cf3b (diff) | |
| download | gcc-e857ea62d4e2c9a8485ee17c77df8a9fece13e82.zip gcc-e857ea62d4e2c9a8485ee17c77df8a9fece13e82.tar.gz gcc-e857ea62d4e2c9a8485ee17c77df8a9fece13e82.tar.bz2 | |
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
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8c47e0f..351b072 100644 --- 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 --- 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", |