From 8fa53379d501bfb9d9c13acb59fa368d7e6f7fc1 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 15 May 2014 08:52:35 -0400 Subject: [PATCH] * call.c (print_conversion_rejection): Use loc consistently. From-SVN: r210475 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/call.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 776a4165cda8..5a13125e513d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2014-05-15 Jason Merrill + + * call.c (print_conversion_rejection): Use loc consistently. + 2014-05-14 Paolo Carlini * cp-tree.h (DIRECT_LIST_INIT_P): Add. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 1b8c38c29f58..20af0e343a1b 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -3231,7 +3231,7 @@ print_conversion_rejection (location_t loc, struct conversion_info *info) /* Conversion of implicit `this' argument failed. */ if (!TYPE_P (info->from)) /* A bad conversion for 'this' must be discarding cv-quals. */ - inform (input_location, " passing %qT as % " + inform (loc, " passing %qT as % " "argument discards qualifiers", from); else @@ -3243,7 +3243,7 @@ print_conversion_rejection (location_t loc, struct conversion_info *info) { if (info->n_arg >= 0) inform (loc, " conversion of argument %d would be ill-formed:", - info->n_arg+1); + info->n_arg + 1); perform_implicit_conversion (info->to_type, info->from, tf_warning_or_error); } @@ -3253,7 +3253,7 @@ print_conversion_rejection (location_t loc, struct conversion_info *info) from, info->to_type); else inform (loc, " no known conversion for argument %d from %qT to %qT", - info->n_arg+1, from, info->to_type); + info->n_arg + 1, from, info->to_type); } /* Print information about a candidate with WANT parameters and we found -- 2.47.3