summaryrefslogtreecommitdiff
path: root/gcc/cp/call.c
diff options
context:
space:
mode:
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2010-10-27 15:48:01 +0000
committerjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2010-10-27 15:48:01 +0000
commit4fa14f1df85b9623bc063b2501b9648e89483521 (patch)
treeada0be5bc675b6376ac5cfc7e565008290f72ca9 /gcc/cp/call.c
parent6ad0b38a7dc7a62b31b79f3a1fc44ee7ac0de914 (diff)
downloadgcc-4fa14f1df85b9623bc063b2501b9648e89483521.tar.gz
* call.c (convert_like_real): Don't check narrowing if the element
is also an initializer-list. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@166005 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/call.c')
-rw-r--r--gcc/cp/call.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 4b36ab0fade..18317183257 100644
--- 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. */