Date: Wednesday, May 6, 2015 @ 18:06:03 Author: heftig Revision: 238553
Remove unused patch Deleted: gcc/trunk/pr65801.patch ---------------+ pr65801.patch | 54 ------------------------------------------------------ 1 file changed, 54 deletions(-) Deleted: pr65801.patch =================================================================== --- pr65801.patch 2015-05-06 15:08:17 UTC (rev 238552) +++ pr65801.patch 2015-05-06 16:06:03 UTC (rev 238553) @@ -1,54 +0,0 @@ -diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c -index 80a6939..884957b 100644 ---- a/gcc/cp/typeck2.c -+++ b/gcc/cp/typeck2.c -@@ -957,9 +957,13 @@ check_narrowing (tree type, tree init, tsubst_flags_t complain) - } - } - else if (complain & tf_error) -- error_at (EXPR_LOC_OR_LOC (init, input_location), -- "narrowing conversion of %qE from %qT to %qT inside { }", -- init, ftype, type); -+ { -+ global_dc->pedantic_errors = 1; -+ pedwarn (EXPR_LOC_OR_LOC (init, input_location), OPT_Wnarrowing, -+ "narrowing conversion of %qE from %qT to %qT inside { }", -+ init, ftype, type); -+ global_dc->pedantic_errors = flag_pedantic_errors; -+ } - } - - return cxx_dialect == cxx98 || ok; -diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index 520c2c5..4ef8f7f 100644 ---- a/gcc/doc/invoke.texi -+++ b/gcc/doc/invoke.texi -@@ -2703,10 +2703,10 @@ int i = @{ 2.2 @}; // error: narrowing from double to int - - This flag is included in @option{-Wall} and @option{-Wc++11-compat}. - --With @option{-std=c++11}, @option{-Wno-narrowing} suppresses for --non-constants the diagnostic required by the standard. Note that this --does not affect the meaning of well-formed code; narrowing conversions --are still considered ill-formed in SFINAE context. -+With @option{-std=c++11}, @option{-Wno-narrowing} suppresses the diagnostic -+required by the standard. Note that this does not affect the meaning -+of well-formed code; narrowing conversions are still considered -+ill-formed in SFINAE context. - - @item -Wnoexcept @r{(C++ and Objective-C++ only)} - @opindex Wnoexcept -diff --git a/gcc/testsuite/g++.dg/cpp0x/Wnarrowing2.C b/gcc/testsuite/g++.dg/cpp0x/Wnarrowing2.C -new file mode 100644 -index 0000000..fc806f9 ---- /dev/null -+++ b/gcc/testsuite/g++.dg/cpp0x/Wnarrowing2.C -@@ -0,0 +1,5 @@ -+// PR c++/65801 -+// { dg-do compile { target c++11 } } -+// { dg-options "-Wno-narrowing" } -+ -+static struct zai { unsigned int x; } x = {-1}; --- -2.3.6 -