From e220f0a4555861af3c18c02522b4cff825691e55 Mon Sep 17 00:00:00 2001 From: Gabriel Dos Reis Date: Wed, 18 Dec 2002 13:07:42 +0000 Subject: [PATCH] cp-tree.h (struct tree_srcloc): Use location_t. * cp-tree.h (struct tree_srcloc): Use location_t. (SOURCE_LOCUS): New. (SRCLOC_FILE, SRCLOC_LINE): Adjust. From-SVN: r60247 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/cp-tree.h | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 67b90addcaa..342f2ecffd8 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2002-12-18 Gabriel Dos Reis + + * cp-tree.h (struct tree_srcloc): Use location_t. + (SOURCE_LOCUS): New. + (SRCLOC_FILE, SRCLOC_LINE): Adjust. + 2002-12-17 Jason Merrill * decl.c (finish_function): Also complain about no return in diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 9176eba7d49..7022e7322f8 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -399,13 +399,15 @@ struct tree_wrapper GTY(()) struct z_candidate *z_c; }; -#define SRCLOC_FILE(NODE) (((struct tree_srcloc*)SRCLOC_CHECK (NODE))->filename) -#define SRCLOC_LINE(NODE) (((struct tree_srcloc*)SRCLOC_CHECK (NODE))->linenum) +#define SOURCE_LOCUS(NODE) \ + (((struct tree_srcloc*)SRCLOC_CHECK (NODE))->locus) +#define SRCLOC_FILE(NODE) SOURCE_LOCUS (NODE).file +#define SRCLOC_LINE(NODE) SOURCE_LOCUS (NODE).line + struct tree_srcloc GTY(()) { struct tree_common common; - const char *filename; - int linenum; + location_t locus; }; /* Macros for access to language-specific slots in an identifier. */