2011-12-18 Paolo Carlini <paolo.carlini@oracle.com>

	* semantics.c (finish_compound_literal): Don't call check_narrowing
	if !(complain & tf_warning_or_error).

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182462 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 18f1dfd..7d625ee 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-18  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * semantics.c (finish_compound_literal): Don't call check_narrowing
+       if !(complain & tf_warning_or_error).
+
 2011-12-17  Jason Merrill  <jason@redhat.com>
 
        PR c++/51588

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index ab9227f..76b0b18 100644 (file)
--- 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)