diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-05-15 12:52:35 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-05-15 12:52:35 +0000 |
| commit | 9e66c6e71807b1502dde28ece24e1ff0e3180986 (patch) | |
| tree | 11aa8b7b727942ebabbfff0c8fe58c84f005d714 /gcc | |
| parent | f2b58c906cf64f3e082bda9808b9f049bb71d5b4 (diff) | |
| download | gcc-9e66c6e71807b1502dde28ece24e1ff0e3180986.tar.gz | |
* call.c (print_conversion_rejection): Use loc consistently.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210475 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/call.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 776a4165cda..5a13125e513 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +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> * cp-tree.h (DIRECT_LIST_INIT_P): Add. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 1b8c38c29f5..20af0e343a1 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 %<this%> " + inform (loc, " passing %qT as %<this%> " "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 |