call.c (convert_like_real): Don't check narrowing if the element is also an initializ...

	* call.c (convert_like_real): Don't check narrowing if the element
	is also an initializer-list.

From-SVN: r166005

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3a7e754b062ce87cd7030c6703aec81629dfcb9c..7646dcacc9dfe0a153142baccf4043a79cb03b20 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-27  Jason Merrill  <jason@redhat.com>
+
+       * call.c (convert_like_real): Don't check narrowing if the element
+       is also an initializer-list.
+
 2010-10-27  Nicola Pero  <nicola.pero@meta-innovation.com>
 
        * parser.c (cp_parser_objc_at_property_declaration): Recognize

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 4b36ab0fade55af3c17c48231a2f46595b1ef327..183171832572e8ead43b1677a95c0a6a45fb8502 100644 (file)
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -5115,7 +5115,8 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
                                          1, false, false, complain);
            if (sub == error_mark_node)
              return sub;
-           check_narrowing (TREE_TYPE (sub), val);
+           if (!BRACE_ENCLOSED_INITIALIZER_P (val))
+             check_narrowing (TREE_TYPE (sub), val);
            CONSTRUCTOR_APPEND_ELT (CONSTRUCTOR_ELTS (new_ctor), NULL_TREE, sub);
          }
        /* Build up the array.  */