diff options
| author | Manuel López-Ibáñez <manu@gcc.gnu.org> | 2015-06-03 19:23:20 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2015-06-03 19:23:20 +0000 |
| commit | d3ea4c064f6e6370eb791985fef4acdd5fb1b833 (patch) | |
| tree | 8c52823d6a36b1409914c63e7e541f67d8c6a56d /gcc/cp/cvt.c | |
| parent | 4753e009664aa5d4cdf0ce86a03224f5bc1f9d7b (diff) | |
| download | gcc-d3ea4c064f6e6370eb791985fef4acdd5fb1b833.zip gcc-d3ea4c064f6e6370eb791985fef4acdd5fb1b833.tar.gz gcc-d3ea4c064f6e6370eb791985fef4acdd5fb1b833.tar.bz2 | |
re PR c++/66130 ("invalid use of non-static member function" message could be clearer)
2015-06-03 Manuel López-Ibáñez <manu@gcc.gnu.org>
Paolo Carlini <paolo.carlini@oracle.com>
PR c++/66130
* typeck.c (invalid_nonstatic_memfn_p): Add location_t parameter and
use it in the diagnostic.
(decay_conversion): Adjust call.
* semantics.c (finish_decltype_type): Likewise.
* call.c (resolve_args, build_new_op_1,
perform_implicit_conversion_flags): Adjust calls.
* cvt.c (ocp_convert, convert_to_void): Likewise.
* cp-tree.h (invalid_nonstatic_memfn_p): Update declaration.
2015-06-03 Manuel López-Ibáñez <manu@gcc.gnu.org>
Paolo Carlini <paolo.carlini@oracle.com>
PR c++/66130
* g++.dg/other/pr66130.C: New.
* g++.dg/cpp0x/pr66130.C: Likewise.
Co-Authored-By: Paolo Carlini <paolo.carlini@oracle.com>
From-SVN: r224099
Diffstat (limited to 'gcc/cp/cvt.c')
| -rw-r--r-- | gcc/cp/cvt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index 9aa9006..ae0326e 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -902,7 +902,7 @@ ocp_convert (tree type, tree expr, int convtype, int flags, { /* If the conversion failed and expr was an invalid use of pointer to member function, try to report a meaningful error. */ - if (invalid_nonstatic_memfn_p (expr, complain)) + if (invalid_nonstatic_memfn_p (loc, expr, complain)) /* We displayed the error message. */; else error_at (loc, "conversion from %qT to non-scalar type %qT requested", @@ -960,7 +960,7 @@ convert_to_void (tree expr, impl_conv_void implicit, tsubst_flags_t complain) if (!TREE_TYPE (expr)) return expr; - if (invalid_nonstatic_memfn_p (expr, complain)) + if (invalid_nonstatic_memfn_p (loc, expr, complain)) return error_mark_node; if (TREE_CODE (expr) == PSEUDO_DTOR_EXPR) { |