From c428869b6d7ddcb0b94d1f248b433040601532f0 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Sun, 18 Dec 2011 23:39:11 +0000 Subject: [PATCH] semantics.c (finish_compound_literal): Don't call check_narrowing if !(complain & tf_warning_or_error). 2011-12-18 Paolo Carlini * semantics.c (finish_compound_literal): Don't call check_narrowing if !(complain & tf_warning_or_error). From-SVN: r182462 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/semantics.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 18f1dfdd6bd..7d625eed554 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2011-12-18 Paolo Carlini + + * semantics.c (finish_compound_literal): Don't call check_narrowing + if !(complain & tf_warning_or_error). + 2011-12-17 Jason Merrill PR c++/51588 diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index ab9227fa925..76b0b18bd69 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -2370,7 +2370,8 @@ finish_compound_literal (tree type, tree compound_literal, return error_mark_node; compound_literal = reshape_init (type, compound_literal, complain); if (SCALAR_TYPE_P (type) - && !BRACE_ENCLOSED_INITIALIZER_P (compound_literal)) + && !BRACE_ENCLOSED_INITIALIZER_P (compound_literal) + && (complain & tf_warning_or_error)) check_narrowing (type, compound_literal); if (TREE_CODE (type) == ARRAY_TYPE && TYPE_DOMAIN (type) == NULL_TREE) -- 2.30.2