From 8ac58be4736b4236df6f7a3b6f89db929d3e325d Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 18 May 1999 22:03:25 +0000 Subject: [PATCH] call.c (joust): Compare the types of the conv ops, not the target types of the conversions. * call.c (joust): Compare the types of the conv ops, not the target types of the conversions. From-SVN: r26999 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/call.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index aa7c6525a54..d781f206ad4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +1999-05-18 Jason Merrill + + * call.c (joust): Compare the types of the conv ops, not the + target types of the conversions. + Tue May 18 00:21:34 1999 Zack Weinberg * lang-specs.h: Define __GNUC__ and __GNUC_MINOR__ only if -no-gcc diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 496cf91e17e..7e7a969bcab 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -4341,8 +4341,8 @@ joust (cand1, cand2, warn) != DECL_CONSTRUCTOR_P (cand2->fn)) /* Don't warn if the two conv ops convert to the same type... */ || (! DECL_CONSTRUCTOR_P (cand1->fn) - && ! same_type_p (TREE_TYPE (cand1->second_conv), - TREE_TYPE (cand2->second_conv))))) + && ! same_type_p (TREE_TYPE (TREE_TYPE (cand1->fn)), + TREE_TYPE (TREE_TYPE (cand2->fn)))))) { int comp = compare_ics (cand1->second_conv, cand2->second_conv); if (comp != winner)