From 9c7d5cae18d86f3db97d56a72cfea60e4fbb125a Mon Sep 17 00:00:00 2001 From: Dodji Seketeli Date: Mon, 29 Nov 2010 16:30:54 +0000 Subject: 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 --- gcc/cp/cvt.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gcc/cp/cvt.c') diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index b10e558..c6335a2 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -1503,9 +1503,7 @@ build_expr_type_conversion (int desires, tree expr, bool complain) if (!TYPE_HAS_CONVERSION (basetype)) return NULL_TREE; - for (conv = lookup_conversions (basetype, /*lookup_template_convs_p=*/true); - conv; - conv = TREE_CHAIN (conv)) + for (conv = lookup_conversions (basetype); conv; conv = TREE_CHAIN (conv)) { int win = 0; tree candidate; -- cgit v1.1