objc-act.c (error_with_ivar): Don't use error_with_file_and_line.

	* objc/objc-act.c (error_with_ivar): Don't use
	error_with_file_and_line.
	(warn_with_method): Don't use warning_with_file_and_line.

From-SVN: r66607

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fd1bdb59d09ebb08534729ec6dc6bb277c5139c6..f1ef99c09d379f12a608ab82f4afcfac91721bc3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-08  Gabriel Dos Reis <gdr@integrable-solutions.net>
+
+       * objc/objc-act.c (error_with_ivar): Don't use
+       error_with_file_and_line. 
+       (warn_with_method): Don't use warning_with_file_and_line.
+
 2003-05-08  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
        * stmt.c (emit_locus): New macro.
@@ -6,7 +12,7 @@
        (struct stmt_status): Replace members x_emit_filename and
        x_emit_lineno with x_emit_locus.
        (set_file_and_line_for_stmt): Adjust.
-       (expand_expr_stmt_value): Don't use warning_with_file_and_file.
+       (expand_expr_stmt_value): Don't use warning_with_file_and_line.
        (warn_if_unused_value): Likewise.
        (check_seenlabel): Likewise.
 

diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index 6ba51df47ed5c10b77182e8c10099e8386b6265e..5cb7c1db6f292d2b3115489b0917d3e102f3f65d 100644 (file)
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -3543,10 +3543,8 @@ error_with_ivar (message, decl, rawdecl)
 
   diagnostic_report_current_function (global_dc);
 
-  error_with_file_and_line (DECL_SOURCE_FILE (decl),
-                           DECL_SOURCE_LINE (decl),
-                           "%s `%s'",
-                           message, gen_declaration (rawdecl, errbuf));
+  error ("%H%s `%s'", &DECL_SOURCE_LOCATION (decl),
+         message, gen_declaration (rawdecl, errbuf));
 
 }
 
@@ -7116,11 +7114,8 @@ warn_with_method (message, mtype, method)
   diagnostic_report_current_function (global_dc);
 
   /* Add a readable method name to the warning.  */
-  warning_with_file_and_line (DECL_SOURCE_FILE (method),
-                             DECL_SOURCE_LINE (method),
-                             "%s `%c%s'",
-                             message, mtype,
-                             gen_method_decl (method, errbuf));
+  warning ("%H%s `%c%s'", &DECL_SOURCE_LOCATION (method),
+           message, mtype, gen_method_decl (method, errbuf));
 }
 
 /* Return 1 if METHOD is consistent with PROTO.  */