decl.c (pushdecl_class_level): Don't use push_srcloc/pop_srcloc which causes…

decl.c (pushdecl_class_level): Don't use push_srcloc/pop_srcloc which causes errors messages to incorrectly...


	* decl.c (pushdecl_class_level):   Don't use push_srcloc/pop_srcloc
	which causes errors messages to incorrectly mention included files.

From-SVN: r69771

gcc/cp/ChangeLog

+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.

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);