aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Froyd <froydnj@codesourcery.com>2010-05-29 14:04:17 +0000
committerNathan Froyd <froydnj@gcc.gnu.org>2010-05-29 14:04:17 +0000
commit673c6299d6e26ca661faa388f54fc1a1cfb07b04 (patch)
tree24edc96439aa71ac78c146cc10aca4bc74db23e6
parent25efe0608f22e455b6da57bbdbba46b624ac8569 (diff)
downloadgcc-673c6299d6e26ca661faa388f54fc1a1cfb07b04.zip
gcc-673c6299d6e26ca661faa388f54fc1a1cfb07b04.tar.gz
gcc-673c6299d6e26ca661faa388f54fc1a1cfb07b04.tar.bz2
cp-tree.h (struct cp_decl_specifier_seq): Move type_location field up.
* cp-tree.h (struct cp_decl_specifier_seq): Move type_location field up. (struct cp_declarator): Move id_loc field up. From-SVN: r160026
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/cp-tree.h8
2 files changed, 9 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7d69a6e..316c717 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-29 Nathan Froyd <froydnj@codesourcery.com>
+
+ * cp-tree.h (struct cp_decl_specifier_seq): Move type_location field up.
+ (struct cp_declarator): Move id_loc field up.
+
2010-05-29 Steven Bosscher <steven@gcc.gnu.org>
* cp-tree.h (ATTRIBUTE_GCC_CXXDIAG): Remove. Require that
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 15c0042..db4fb0a 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -4368,14 +4368,14 @@ typedef enum cp_decl_spec {
typedef struct cp_decl_specifier_seq {
/* The number of times each of the keywords has been seen. */
unsigned specs[(int) ds_last];
+ /* The location of the primary type. Mainly used for error
+ reporting. */
+ location_t type_location;
/* The primary type, if any, given by the decl-specifier-seq.
Modifiers, like "short", "const", and "unsigned" are not
reflected here. This field will be a TYPE, unless a typedef-name
was used, in which case it will be a TYPE_DECL. */
tree type;
- /* The location of the primary type. Mainly used for error
- reporting. */
- location_t type_location;
/* The attributes, if any, provided with the specifier sequence. */
tree attributes;
/* If non-NULL, a built-in type that the user attempted to redefine
@@ -4445,12 +4445,12 @@ struct cp_declarator {
/* Whether we parsed an ellipsis (`...') just before the declarator,
to indicate this is a parameter pack. */
BOOL_BITFIELD parameter_pack_p : 1;
+ location_t id_loc; /* Currently only set for cdk_id and cdk_function. */
/* Attributes that apply to this declarator. */
tree attributes;
/* For all but cdk_id and cdk_error, the contained declarator. For
cdk_id and cdk_error, guaranteed to be NULL. */
cp_declarator *declarator;
- location_t id_loc; /* Currently only set for cdk_id and cdk_function. */
union {
/* For identifiers. */
struct {