* call.c (add_builtin_candidates): Handle overloaded conversion ops.

From-SVN: r25663

* call.c (add_builtin_candidates): Handle overloaded conversion ops.
From-SVN: r25663
47898a19 · Jason Merrill · Jason Merrill · a5d753c0 · 47898a19 · 47898a19
Commit 47898a19 authored Mar 10, 1999 by Jason Merrill Committed by Jason Merrill Mar 09, 1999
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

gcc/cp/ChangeLog
+4 -0

gcc/cp/call.c
+2 -2

No files found.
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
+1999-03-09  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* call.c (add_builtin_candidates): Handle overloaded conversion ops.
+
 1999-03-09  Mark Mitchell  <mark@markmitchell.com>

 	* cp-tree.h (flag_access_control): Declare.

--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -1868,7 +1868,7 @@ add_builtin_candidates (candidates, code, code2, fnname, args, flags)
 	;
      else if (IS_AGGR_TYPE (argtypes[i]))
 	{
-	  tree convs = lookup_conversions (argtypes[i]);
+	  tree convs;

 	  if (i == 0 && code == MODIFY_EXPR && code2 == NOP_EXPR)
 	    return candidates;
@@ -1890,7 +1890,7 @@ add_builtin_candidates (candidates, code, code2, fnname, args, flags)

 	  for (; convs; convs = TREE_CHAIN (convs))
 	    {
-	      type = TREE_TYPE (TREE_TYPE (TREE_VALUE (convs)));
+	      type = TREE_TYPE (TREE_TYPE (OVL_CURRENT (TREE_VALUE (convs))));

 	      if (i == 0 && ref1
 		  && (TREE_CODE (type) != REFERENCE_TYPE