diff options
| author | Jason Merrill <jason@redhat.com> | 2002-12-03 12:29:43 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2002-12-03 12:29:43 -0500 |
| commit | c203334d6d4d5e2563d90deb06f7c59bf150f00c (patch) | |
| tree | 4f406195d5e2c49cc0303b48ce06164ff997cd7b /gcc/cp | |
| parent | 491a97772254870ad1de34528857e94f76e00a10 (diff) | |
| download | gcc-c203334d6d4d5e2563d90deb06f7c59bf150f00c.zip gcc-c203334d6d4d5e2563d90deb06f7c59bf150f00c.tar.gz gcc-c203334d6d4d5e2563d90deb06f7c59bf150f00c.tar.bz2 | |
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
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/call.c | 3 |
2 files changed, 7 insertions, 1 deletions
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 <jason@redhat.com> + + * call.c (build_user_type_conversion_1): Don't set ICS_BAD_FLAG on + an ambiguous conversion. + 2002-12-03 Mark Mitchell <mark@codesourcery.com> 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; } |