diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2004-12-30 23:29:33 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2004-12-30 23:29:33 +0000 |
| commit | 1d786913b3e013765d108640d6f6ee03c63fcea2 (patch) | |
| tree | 80c424b73600d77daa433461d979103437d7196b /gcc/cp/decl2.c | |
| parent | 36651afeec5fca8d1a0f00775b1586b1669f211f (diff) | |
| download | gcc-1d786913b3e013765d108640d6f6ee03c63fcea2.zip gcc-1d786913b3e013765d108640d6f6ee03c63fcea2.tar.gz gcc-1d786913b3e013765d108640d6f6ee03c63fcea2.tar.bz2 | |
cp-tree.h (cp_declarator): Split "name" field into qualifying_scope and unqualified_name.
* cp-tree.h (cp_declarator): Split "name" field into
qualifying_scope and unqualified_name.
* decl.c (get_scope_of_declarator): Adjust accordingly.
(grokdeclarator): Likewise.
* decl2.c (grokfield): Likewise, and adjust call to
do_class_using_decl.
* name-lookup.c (do_class_using_decl): Split "decl" into
"scope" and "name". Remove unnecessary code.
* name-lookup.h (do_class_using_decl): Adjust declaration.
* parser.c (make_id_declarator): Split "id" into qualifying_scope
and unqualified_name.
(cp_parser_using_declaration): Adjust call to do_class_using_decl.
(cp_parser_direct_declarator): Adjust to handle the fact that
cp_parser_declarator_id no longer returns a SCOPE_REF.
(cp_parser_direct_declarator): Likewise.
(cp_parser_declarator_id): Do not create a SCOPE_REF for qualified
names.
(cp_parser_member_declaration): Adjust call to make_id_declarator.
(cp_parser_check_declarator_template_parameters): Do not expect a
SCOPE_REF.
* decl.c (duplicate_decls): Call ggc_free on declarations we will
not be needing any longer.
From-SVN: r92746
Diffstat (limited to 'gcc/cp/decl2.c')
| -rw-r--r-- | gcc/cp/decl2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 231939d..0df5b25 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -830,11 +830,11 @@ grokfield (const cp_declarator *declarator, if (!declspecs->any_specifiers_p && declarator->kind == cdk_id - && TREE_CODE (declarator->u.id.name) == SCOPE_REF - && (TREE_CODE (TREE_OPERAND (declarator->u.id.name, 1)) - == IDENTIFIER_NODE)) + && declarator->u.id.qualifying_scope + && TREE_CODE (declarator->u.id.unqualified_name) == IDENTIFIER_NODE) /* Access declaration */ - return do_class_using_decl (declarator->u.id.name); + return do_class_using_decl (declarator->u.id.qualifying_scope, + declarator->u.id.unqualified_name); if (init && TREE_CODE (init) == TREE_LIST |