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

From-SVN: r25663

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7dcdfeae0526da42cb8106f779db23499ef8abd0..93b5caf1a6688de4f26a7fc99a1abd141f39b16a 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+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.

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 1376303140ad0a08781e38992aa605d31bb4853d..4e2e2538d40b01c0896319cc78cd66f3ca77f99a 100644 (file)
--- 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