diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a4e454bf814..7abf46ba693 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2003-07-24 Per Bothner <pbothner@apple.com> + + * decl.c (pushdecl_class_level): Don't use push_srcloc/pop_srcloc + which causes errors messages to incorrectly mention included files. + 2003-07-24 Mark Mitchell <mark@codesourcery.com> * cp-tree.h (convert_to_base_statically): Declare. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 4443d70d400..cec42f37770 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -4209,10 +4209,11 @@ pushdecl_class_level (tree x) for (f = TYPE_FIELDS (TREE_TYPE (x)); f; f = TREE_CHAIN (f)) { - push_srcloc (DECL_SOURCE_FILE (f), DECL_SOURCE_LINE (f)); + location_t save_location = input_location; + input_location = DECL_SOURCE_LOCATION (f); if (!pushdecl_class_level (f)) is_valid = false; - pop_srcloc (); + input_location = save_location; } } timevar_pop (TV_NAME_LOOKUP); |
