Skip to content

R
riscv-gcc-1
Commit 8fa53379 by Jason Merrill Committed by Jason Merrill
Options

* call.c (print_conversion_rejection): Use loc consistently. 

From-SVN: r210475
parent c0eef1c8
Showing with 7 additions and 3 deletions
gcc/cp/ChangeLog
2014-05-15 Jason Merrill <jason@redhat.com>
* call.c (print_conversion_rejection): Use loc consistently.
2014-05-14 Paolo Carlini <paolo.carlini@oracle.com> 2014-05-14 Paolo Carlini <paolo.carlini@oracle.com>
* cp-tree.h (DIRECT_LIST_INIT_P): Add. * cp-tree.h (DIRECT_LIST_INIT_P): Add.
......
gcc/cp/call.c
...@@ -3231,7 +3231,7 @@ print_conversion_rejection (location_t loc, struct conversion_info *info) ...@@ -3231,7 +3231,7 @@ print_conversion_rejection (location_t loc, struct conversion_info *info)
/* Conversion of implicit `this' argument failed. */ /* Conversion of implicit `this' argument failed. */
if (!TYPE_P (info->from)) if (!TYPE_P (info->from))
/* A bad conversion for 'this' must be discarding cv-quals. */ /* A bad conversion for 'this' must be discarding cv-quals. */
inform (input_location, " passing %qT as %<this%> " inform (loc, " passing %qT as %<this%> "
"argument discards qualifiers", "argument discards qualifiers",
from); from);
else else
...@@ -3243,7 +3243,7 @@ print_conversion_rejection (location_t loc, struct conversion_info *info) ...@@ -3243,7 +3243,7 @@ print_conversion_rejection (location_t loc, struct conversion_info *info)
{ {
if (info->n_arg >= 0) if (info->n_arg >= 0)
inform (loc, " conversion of argument %d would be ill-formed:", 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, perform_implicit_conversion (info->to_type, info->from,
tf_warning_or_error); tf_warning_or_error);
} }
...@@ -3253,7 +3253,7 @@ print_conversion_rejection (location_t loc, struct conversion_info *info) ...@@ -3253,7 +3253,7 @@ print_conversion_rejection (location_t loc, struct conversion_info *info)
from, info->to_type); from, info->to_type);
else else
inform (loc, " no known conversion for argument %d from %qT to %qT", 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 /* Print information about a candidate with WANT parameters and we found
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment