diff options
| author | Mike Stump <mrs@gcc.gnu.org> | 1996-12-18 02:46:25 +0000 |
|---|---|---|
| committer | Mike Stump <mrs@gcc.gnu.org> | 1996-12-18 02:46:25 +0000 |
| commit | d2e5ee5c704b81a8857f6068a785a4e056b8eafa (patch) | |
| tree | 8756793fee8ba11b6c6e2195d2a9521061792978 /gcc/cp/lex.c | |
| parent | f442f7234e0059d1273207752894ef364cd6078c (diff) | |
| download | gcc-d2e5ee5c704b81a8857f6068a785a4e056b8eafa.zip gcc-d2e5ee5c704b81a8857f6068a785a4e056b8eafa.tar.gz gcc-d2e5ee5c704b81a8857f6068a785a4e056b8eafa.tar.bz2 | |
90th Cygnus<->FSF quick merge
From-SVN: r13321
Diffstat (limited to 'gcc/cp/lex.c')
| -rw-r--r-- | gcc/cp/lex.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c index 448cb1f..a34e4f0 100644 --- a/gcc/cp/lex.c +++ b/gcc/cp/lex.c @@ -1112,7 +1112,7 @@ set_vardecl_interface_info (prev, vars) if (CLASSTYPE_INTERFACE_KNOWN (type)) { if (CLASSTYPE_INTERFACE_ONLY (type)) - set_typedecl_interface_info (prev, TYPE_NAME (type)); + set_typedecl_interface_info (prev, TYPE_MAIN_DECL (type)); else CLASSTYPE_VTABLE_NEEDS_WRITING (type) = 1; DECL_EXTERNAL (vars) = CLASSTYPE_INTERFACE_ONLY (type); @@ -2721,8 +2721,8 @@ identifier_typedecl_value (node) do (IDENTIFIER_GLOBAL_VALUE (node)); #undef do /* Will this one ever happen? */ - if (TYPE_NAME (type)) - return TYPE_NAME (type); + if (TYPE_MAIN_DECL (type)) + return TYPE_MAIN_DECL (type); /* We used to do an internal error of 62 here, but instead we will handle the return of a null appropriately in the callers. */ @@ -3366,7 +3366,7 @@ real_yylex () )) { pedwarn ("floating point number exceeds range of `%s'", - IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (type)))); + IDENTIFIER_POINTER (TYPE_IDENTIFIER (type))); } /* Note: garbage_chars is -1 if first char is *not* garbage. */ while (isalnum (c)) |