diff options
| author | Richard Sandiford <rsandifo@gcc.gnu.org> | 2002-04-11 16:39:41 +0000 |
|---|---|---|
| committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2002-04-11 16:39:41 +0000 |
| commit | af4e7bac5cb41a0cd8be91635f025eec4afc79cf (patch) | |
| tree | 205a8d5ef46cb4a09431aae336cb04669f966cc0 /gcc/cp | |
| parent | 94ed000253a233a9a41c5094d1a932097803cc1a (diff) | |
| download | gcc-af4e7bac5cb41a0cd8be91635f025eec4afc79cf.zip gcc-af4e7bac5cb41a0cd8be91635f025eec4afc79cf.tar.gz gcc-af4e7bac5cb41a0cd8be91635f025eec4afc79cf.tar.bz2 | |
Revert previous patch.
From-SVN: r52166
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 31 |
2 files changed, 3 insertions, 34 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6f355c3..a2d8b8f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,9 +1,3 @@ -2002-04-11 Richard Sandiford <rsandifo@redhat.com> - - * decl.c (duplicate_decls): Don't try to unify an implicit typedef - with an explicit one. - (lookup_tag): Extract the tag of an explicit typedef. - 2002-04-10 Nathan Sidwell <nathan@codesourcery.com> PR c++/5507 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index f55e1d4..dc9d373 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -3426,18 +3426,6 @@ duplicate_decls (newdecl, olddecl) } } - /* Do not merge an implicit typedef with an explicit one. In: - - class A; - ... - typedef class A A __attribute__ ((foo)); - - the attribute should apply only to the typedef. */ - if (TREE_CODE (olddecl) == TYPE_DECL - && (DECL_IMPLICIT_TYPEDEF_P (olddecl) - || DECL_IMPLICIT_TYPEDEF_P (newdecl))) - return 0; - /* If new decl is `static' and an `extern' was seen previously, warn about it. */ warn_extern_redeclared_static (newdecl, olddecl); @@ -5348,23 +5336,10 @@ lookup_tag (form, name, binding_level, thislevel_only) else old = BINDING_TYPE (old); - /* If the declaration has an original type, it must a - typedef. When it is an explicit typedef of the form: - - typedef struct A A; - - the original type will be the tag that we want. - We should not return any other kind of typedef. - - Detect the valid case by checking that the original - type has the same name and context as the typedef. */ + /* If it has an original type, it is a typedef, and we + should not return it. */ if (old && DECL_ORIGINAL_TYPE (TYPE_NAME (old))) - { - old = DECL_ORIGINAL_TYPE (TYPE_NAME (old)); - if (TYPE_IDENTIFIER (old) != name - || context_for_name_lookup (TYPE_NAME (old)) != tail) - old = NULL_TREE; - } + old = NULL_TREE; if (old && TREE_CODE (old) != form && (form == ENUMERAL_TYPE || TREE_CODE (old) == ENUMERAL_TYPE)) { |