diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/call.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index aa7c652..d781f20 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +1999-05-18 Jason Merrill <jason@yorick.cygnus.com> + + * 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 <zack@rabi.phys.columbia.edu> * 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 496cf91..7e7a969 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) |