diff options
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 7 | ||||
| -rw-r--r-- | libcpp/include/cpp-id-data.h | 6 | ||||
| -rw-r--r-- | libcpp/include/cpplib.h | 12 | ||||
| -rw-r--r-- | libcpp/include/line-map.h | 6 | ||||
| -rw-r--r-- | libcpp/include/symtab.h | 3 |
5 files changed, 16 insertions, 18 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index ff72061..a9ccc59 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,10 @@ +2009-04-21 Taras Glek <tglek@mozilla.com> + + * include/cpp-id-data.h: Update GTY annotations to new syntax. + * include/cpplib.h: Likewise. + * include/line-map.h: Likewise. + * include/symtab.h: Likewise. + 2009-04-22 Manuel Lopez-Ibanez <manu@gcc.gnu.org> PR c++/14875 diff --git a/libcpp/include/cpp-id-data.h b/libcpp/include/cpp-id-data.h index 029d424..a57edad 100644 --- a/libcpp/include/cpp-id-data.h +++ b/libcpp/include/cpp-id-data.h @@ -25,8 +25,7 @@ typedef unsigned char uchar; #define UC (const unsigned char *) /* Intended use: UC"string" */ /* Chained list of answers to an assertion. */ -struct answer GTY(()) -{ +struct GTY(()) answer { struct answer *next; unsigned int count; cpp_token GTY ((length ("%h.count"))) first[1]; @@ -34,8 +33,7 @@ struct answer GTY(()) /* Each macro definition is recorded in a cpp_macro structure. Variadic macros cannot occur with traditional cpp. */ -struct cpp_macro GTY(()) -{ +struct GTY(()) cpp_macro { /* Parameters, if any. */ cpp_hashnode ** GTY ((nested_ptr (union tree_node, "%h ? CPP_HASHNODE (GCC_IDENT_TO_HT_IDENT (%h)) : NULL", diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h index b38d9f4..80e9056 100644 --- a/libcpp/include/cpplib.h +++ b/libcpp/include/cpplib.h @@ -162,8 +162,7 @@ enum c_lang {CLK_GNUC89 = 0, CLK_GNUC99, CLK_STDC89, CLK_STDC94, CLK_STDC99, CLK_GNUCXX, CLK_CXX98, CLK_GNUCXX0X, CLK_CXX0X, CLK_ASM}; /* Payload of a NUMBER, STRING, CHAR or COMMENT token. */ -struct cpp_string GTY(()) -{ +struct GTY(()) cpp_string { unsigned int len; const unsigned char *text; }; @@ -196,8 +195,7 @@ enum cpp_token_fld_kind { /* A preprocessing token. This has been carefully packed and should occupy 16 bytes on 32-bit hosts and 24 bytes on 64-bit hosts. */ -struct cpp_token GTY(()) -{ +struct GTY(()) cpp_token { source_location src_loc; /* Location of first char of token. */ ENUM_BITFIELD(cpp_ttype) type : CHAR_BIT; /* token type */ unsigned short flags; /* flags - see above */ @@ -604,8 +602,7 @@ enum { ends. Also used to store CPP identifiers, which are a superset of identifiers in the grammatical sense. */ -union _cpp_hashnode_value GTY(()) -{ +union GTY(()) _cpp_hashnode_value { /* If a macro. */ cpp_macro * GTY((tag ("NTV_MACRO"))) macro; /* Answers to an assertion. */ @@ -616,8 +613,7 @@ union _cpp_hashnode_value GTY(()) unsigned short GTY ((tag ("NTV_ARGUMENT"))) arg_index; }; -struct cpp_hashnode GTY(()) -{ +struct GTY(()) cpp_hashnode { struct ht_identifier ident; unsigned int is_directive : 1; unsigned int directive_index : 7; /* If is_directive, diff --git a/libcpp/include/line-map.h b/libcpp/include/line-map.h index 56ab79a..b556013a 100644 --- a/libcpp/include/line-map.h +++ b/libcpp/include/line-map.h @@ -58,8 +58,7 @@ typedef void *(*line_map_realloc) (void *, size_t); creation of this line map, SYSP is one for a system header, two for a C system header file that therefore needs to be extern "C" protected in C++, and zero otherwise. */ -struct line_map GTY(()) -{ +struct GTY(()) line_map { const char *to_file; linenum_type to_line; source_location start_location; @@ -72,8 +71,7 @@ struct line_map GTY(()) }; /* A set of chronological line_map structures. */ -struct line_maps GTY(()) -{ +struct GTY(()) line_maps { struct line_map * GTY ((length ("%h.used"))) maps; unsigned int allocated; unsigned int used; diff --git a/libcpp/include/symtab.h b/libcpp/include/symtab.h index 225301e..e7c5937 100644 --- a/libcpp/include/symtab.h +++ b/libcpp/include/symtab.h @@ -27,8 +27,7 @@ along with this program; see the file COPYING3. If not see /* This is what each hash table entry points to. It may be embedded deeply within another object. */ typedef struct ht_identifier ht_identifier; -struct ht_identifier GTY(()) -{ +struct GTY(()) ht_identifier { const unsigned char *str; unsigned int len; unsigned int hash_value; |