2007-02-15 Sandra Loosemore <sandra@codesourcery.com>

[pf3gnuchains/gcc-fork.git] / gcc / cp / cvt.c

diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index 220eddd..497179b 100644 (file)
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -902,9 +902,11 @@ convert_to_void (tree expr, const char *implicit)
          if (TREE_CODE (init) == AGGR_INIT_EXPR
              && !AGGR_INIT_VIA_CTOR_P (init))
            {
-             tree fn = TREE_OPERAND (init, 0);
-             expr = build3 (CALL_EXPR, TREE_TYPE (TREE_TYPE (TREE_TYPE (fn))),
-                            fn, TREE_OPERAND (init, 1), NULL_TREE);
+             tree fn = AGGR_INIT_EXPR_FN (init);
+             expr = build_call_array (TREE_TYPE (TREE_TYPE (TREE_TYPE (fn))),
+                                      fn,
+                                      aggr_init_expr_nargs (init),
+                                      AGGR_INIT_EXPR_ARGP (init));
            }
        }
       break;