aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2013-04-26 08:54:54 +0200
committerJakub Jelinek <jakub@gcc.gnu.org>2013-04-26 08:54:54 +0200
commite78e8a0b19f9becc90a0bcb4684fb83eae10533f (patch)
tree445f8e0a123deaa48447d0f3140806f626a413a0 /gcc/cp
parent013e5ef956c191f9f6748615b22b78653a5e762a (diff)
downloadgcc-e78e8a0b19f9becc90a0bcb4684fb83eae10533f.zip
gcc-e78e8a0b19f9becc90a0bcb4684fb83eae10533f.tar.gz
gcc-e78e8a0b19f9becc90a0bcb4684fb83eae10533f.tar.bz2
diagnostic.h (file_name_as_prefix): Add context argument.
* diagnostic.h (file_name_as_prefix): Add context argument. * diagnostic.c (file_name_as_prefix): Likewise. Colorize the string as locus. * langhooks.c (lhd_print_error_function): Adjust caller. cp/ * error.c (cp_print_error_function): Adjust file_name_as_prefix caller. From-SVN: r198331
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/error.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 33fc34a..39fbc46 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-26 Jakub Jelinek <jakub@redhat.com>
+
+ * error.c (cp_print_error_function): Adjust file_name_as_prefix
+ caller.
+
2013-04-25 Jason Merrill <jason@redhat.com>
PR c++/56859
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 4681e84..c57a5aa 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -2962,7 +2962,7 @@ cp_print_error_function (diagnostic_context *context,
const char *file = LOCATION_FILE (diagnostic->location);
tree abstract_origin = diagnostic_abstract_origin (diagnostic);
char *new_prefix = (file && abstract_origin == NULL)
- ? file_name_as_prefix (file) : NULL;
+ ? file_name_as_prefix (context, file) : NULL;
pp_base_set_prefix (context->printer, new_prefix);