* cp-tree.h (struct tree_srcloc): Use location_t.

        (SOURCE_LOCUS): New.
        (SRCLOC_FILE, SRCLOC_LINE): Adjust.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@60247 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 67b90ad..342f2ec 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-18  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+       * cp-tree.h (struct tree_srcloc): Use location_t.
+       (SOURCE_LOCUS): New.
+       (SRCLOC_FILE, SRCLOC_LINE): Adjust.
+
 2002-12-17  Jason Merrill  <jason@redhat.com>
 
        * 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 9176eba..7022e73 100644 (file)
--- 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.  */