From 31bdd08a9d21a2fd7019bbd7b178c8911a7d2e41 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Tue, 15 Sep 2015 16:53:01 +0000 Subject: Change of location_get_source_line signature gcc/ChangeLog: * input.h (location_get_source_line): Drop "expanded_location" param in favor of a file and line number. * input.c (location_get_source_line): Likewise. (dump_location_info): Update for change in signature of location_get_source_line. * diagnostic.c (diagnostic_print_caret_line): Likewise. gcc/c-family/ChangeLog: * c-format.c (location_from_offset): Update for change in signature of location_get_source_line. * c-indentation.c (get_visual_column): Likewise. (line_contains_hash_if): Likewise. From-SVN: r227800 --- gcc/diagnostic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gcc/diagnostic.c') diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c index e5c3c1d..a1ffe72 100644 --- a/gcc/diagnostic.c +++ b/gcc/diagnostic.c @@ -377,7 +377,8 @@ diagnostic_print_caret_line (diagnostic_context * context, int cmax = MAX (xloc1.column, xloc2.column); int line_width; - const char *line = location_get_source_line (xloc1, &line_width); + const char *line = location_get_source_line (xloc1.file, xloc1.line, + &line_width); if (line == NULL || cmax > line_width) return; -- cgit v1.1