From 07e4a80b76c8ae344118d2642ef9e5e4004ba7ec Mon Sep 17 00:00:00 2001 From: rth Date: Tue, 2 Dec 2003 10:11:24 +0000 Subject: [PATCH] * name-lookup.h (struct cp_binding_level): Use ENUM_BITFIELD. * parser.c (struct cp_token): Likewise. (struct cp_parser_token_tree_map_node): Likewise. * lex.c (struct resword): Move const after ENUM_BITFIELD. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74169 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 7 +++++++ gcc/cp/lex.c | 2 +- gcc/cp/name-lookup.h | 2 +- gcc/cp/parser.c | 8 ++++---- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9686a36..b4d1df9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2003-12-02 Richard Henderson + + * name-lookup.h (struct cp_binding_level): Use ENUM_BITFIELD. + * parser.c (struct cp_token): Likewise. + (struct cp_parser_token_tree_map_node): Likewise. + * lex.c (struct resword): Move const after ENUM_BITFIELD. + 2003-11-30 Mark Mitchell PR c++/9849 diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c index 6d54823..37baa48 100644 --- a/gcc/cp/lex.c +++ b/gcc/cp/lex.c @@ -231,7 +231,7 @@ init_operators (void) struct resword { const char *const word; - const ENUM_BITFIELD(rid) rid : 16; + ENUM_BITFIELD(rid) const rid : 16; const unsigned int disable : 16; }; diff --git a/gcc/cp/name-lookup.h b/gcc/cp/name-lookup.h index df7615a..8c8b040 100644 --- a/gcc/cp/name-lookup.h +++ b/gcc/cp/name-lookup.h @@ -211,7 +211,7 @@ struct cp_binding_level GTY(()) /* The kind of scope that this object represents. However, a SK_TEMPLATE_SPEC scope is represented with KIND set to SK_TEMPALTE_PARMS and EXPLICIT_SPEC_P set to true. */ - enum scope_kind kind : 4; + ENUM_BITFIELD (scope_kind) kind : 4; /* True if this scope is an SK_TEMPLATE_SPEC scope. This field is only valid if KIND == SK_TEMPLATE_PARMS. */ diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index f2f1c5b..c157173 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -68,10 +68,10 @@ typedef struct cp_token GTY (()) { /* The kind of token. */ - enum cpp_ttype type : 8; + ENUM_BITFIELD (cpp_ttype) type : 8; /* If this token is a keyword, this value indicates which keyword. Otherwise, this value is RID_MAX. */ - enum rid keyword : 8; + ENUM_BITFIELD (rid) keyword : 8; /* The value associated with this token, if any. */ tree value; /* The location at which this token was found. */ @@ -1076,9 +1076,9 @@ typedef enum cp_parser_declarator_kind typedef struct cp_parser_token_tree_map_node { /* The token type. */ - enum cpp_ttype token_type : 8; + ENUM_BITFIELD (cpp_ttype) token_type : 8; /* The corresponding tree code. */ - enum tree_code tree_type : 8; + ENUM_BITFIELD (tree_code) tree_type : 8; } cp_parser_token_tree_map_node; /* A complete map consists of several ordinary entries, followed by a -- 2.7.4