diff options
| author | Dodji Seketeli <dodji@redhat.com> | 2010-11-29 16:30:54 +0000 |
|---|---|---|
| committer | Dodji Seketeli <dodji@gcc.gnu.org> | 2010-11-29 17:30:54 +0100 |
| commit | 9c7d5cae18d86f3db97d56a72cfea60e4fbb125a (patch) | |
| tree | ac5e6bf206d5df6cf300a80924c9240f011cf8f5 /gcc/cp/search.c | |
| parent | 3b8204d789565e2afb6b0d3fea63d69fd99a5a5d (diff) | |
| download | gcc-9c7d5cae18d86f3db97d56a72cfea60e4fbb125a.zip gcc-9c7d5cae18d86f3db97d56a72cfea60e4fbb125a.tar.gz gcc-9c7d5cae18d86f3db97d56a72cfea60e4fbb125a.tar.bz2 | |
re PR c++/45383 (Implicit conversion to pointer does no longer automatically generate operator== and operator!=.)
Fix PR c++/45383
Reverting the fix for PR c++/42260 fixes c++/45383.
This reverts commit r155415.
gcc/cp/
Reverted patch for PR c++/42260
* cp-tree.h (lookup_conversions): Reverted "Add new bool parameter to
declarationE."
* search.c (lookup_conversion): Reverted "Use new bool parameter in
definition".
* call.c (add_builtin_candidates): Reverted "Don't lookup template
conversion"
(convert_class_to_reference, build_user_type_conversion_1,
build_op_call): Reverted "Adjust".
* cvt.c (build_expr_type_conversion): Reverted "Likewise".
gcc/testsuite/
Reverted patch for PR c++/42260
* conversion/cast2.C: Reverted New test.
From-SVN: r167248
Diffstat (limited to 'gcc/cp/search.c')
| -rw-r--r-- | gcc/cp/search.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/gcc/cp/search.c b/gcc/cp/search.c index 370ddf6..c02800c 100644 --- a/gcc/cp/search.c +++ b/gcc/cp/search.c @@ -2440,13 +2440,10 @@ lookup_conversions_r (tree binfo, functions in this node were selected. This function is effectively performing a set of member lookups as lookup_fnfield does, but using the type being converted to as the unique key, rather than the - field name. - If LOOKUP_TEMPLATE_CONVS_P is TRUE, the returned TREE_LIST contains - the non-hidden user-defined template conversion functions too. */ + field name. */ tree -lookup_conversions (tree type, - bool lookup_template_convs_p) +lookup_conversions (tree type) { tree convs, tpl_convs; tree list = NULL_TREE; @@ -2473,9 +2470,6 @@ lookup_conversions (tree type, } } - if (lookup_template_convs_p == false) - tpl_convs = NULL_TREE; - for (; tpl_convs; tpl_convs = TREE_CHAIN (tpl_convs)) { tree probe, next; |