OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

call.c (joust): Compare the types of the conv ops, not the target types of the conversions.

Browse Source 
* call.c (joust): Compare the types of the conv ops, not the
	target types of the conversions.

From-SVN: r26999
This commit is contained in:
Jason Merrill 1999-05-18 22:03:25 +00:00 committed by Jason Merrill
parent 780c0cb4d2
commit 8ac58be473
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -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

4
gcc/cp/call.c
View File

@ -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)