From c203334d6d4d5e2563d90deb06f7c59bf150f00c Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 3 Dec 2002 12:29:43 -0500 Subject: call.c (build_user_type_conversion_1): Don't set ICS_BAD_FLAG on an ambiguous conversion. * call.c (build_user_type_conversion_1): Don't set ICS_BAD_FLAG on an ambiguous conversion. From-SVN: r59775 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/call.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'gcc/cp') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2399b18..611557b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2002-12-03 Jason Merrill + + * call.c (build_user_type_conversion_1): Don't set ICS_BAD_FLAG on + an ambiguous conversion. + 2002-12-03 Mark Mitchell PR c++/8688 diff --git a/gcc/cp/call.c b/gcc/cp/call.c index a7f9a91..1678ed2 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -2620,7 +2620,8 @@ build_user_type_conversion_1 (totype, expr, flags) cand = candidates; /* any one will do */ cand->second_conv = build1 (AMBIG_CONV, totype, expr); ICS_USER_FLAG (cand->second_conv) = 1; - ICS_BAD_FLAG (cand->second_conv) = 1; + /* Don't set ICS_BAD_FLAG; an ambiguous conversion is no worse than + another user-defined conversion. */ return cand; } -- cgit v1.1