From ac8bb1ec43d74b8d6cd8627a8ab06ad567f01b29 Mon Sep 17 00:00:00 2001 From: Bernhard Fischer Date: Sun, 16 Dec 2007 18:16:15 +0100 Subject: [PATCH] Undo misguided distinction WRT deciding if a warning is an error or a warning. A Warning is a warning, diagnostics DTRT. Cosmetic correction from fallout for fix for PR21061. See ML-archives for details on why this hunk is wrong but still harmless in effect. 2007-12-16 Bernhard Fischer * errors.c (gfc_notify_std): As originally stated but improperly changed, disregard warnings_are_errors for deciding which buffer to use for warnings. From-SVN: r130990 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/error.c | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 50425ab4b9d..3e3d717fe90 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2007-12-16 Bernhard Fischer + + * errors.c (gfc_notify_std): As originally stated but improperly + changed, disregard warnings_are_errors for deciding which buffer + to use for warnings. + 2007-12-16 Paul Thomas PR fortran/31213 diff --git a/gcc/fortran/error.c b/gcc/fortran/error.c index e25a4286b24..fa1a505c3f3 100644 --- a/gcc/fortran/error.c +++ b/gcc/fortran/error.c @@ -715,8 +715,7 @@ gfc_notify_std (int std, const char *nocmsgid, ...) if (gfc_suppress_error) return warning ? SUCCESS : FAILURE; - cur_error_buffer = (warning && !warnings_are_errors) - ? &warning_buffer : &error_buffer; + cur_error_buffer = warning ? &warning_buffer : &error_buffer; cur_error_buffer->flag = 1; cur_error_buffer->index = 0; -- 2.30.2