summaryrefslogtreecommitdiff
path: root/gcc/diagnostic.c
diff options
context:
space:
mode:
authorDavid Malcolm <dmalcolm@redhat.com>2015-09-15 16:53:01 +0000
committerDavid Malcolm <dmalcolm@gcc.gnu.org>2015-09-15 16:53:01 +0000
commit31bdd08a9d21a2fd7019bbd7b178c8911a7d2e41 (patch)
treeb8835d6ddb4631db4e8d4f261d3286ea4d207b80 /gcc/diagnostic.c
parentc55721c0dfee6d4de107cab63bfe0d1ebf5bdfde (diff)
downloadgcc-31bdd08a9d21a2fd7019bbd7b178c8911a7d2e41.tar.gz
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
Diffstat (limited to 'gcc/diagnostic.c')
-rw-r--r--gcc/diagnostic.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c
index e5c3c1dbfec..a1ffe72ea95 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;