aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorBernhard Fischer <aldot@gcc.gnu.org>2007-12-16 18:16:15 +0100
committerBernhard Reutner-Fischer <aldot@gcc.gnu.org>2007-12-16 18:16:15 +0100
commitac8bb1ec43d74b8d6cd8627a8ab06ad567f01b29 (patch)
tree83ba3a10a87aa6ad2cf76f3ae3f8be50289acb0f /gcc
parent42cb1b89602f0a2f0f281e4bc452fa59ab4679c1 (diff)
downloadgcc-ac8bb1ec43d74b8d6cd8627a8ab06ad567f01b29.zip
gcc-ac8bb1ec43d74b8d6cd8627a8ab06ad567f01b29.tar.gz
gcc-ac8bb1ec43d74b8d6cd8627a8ab06ad567f01b29.tar.bz2
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 <aldot@gcc.gnu.org> * 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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/error.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 50425ab..3e3d717 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-16 Bernhard Fischer <aldot@gcc.gnu.org>
+
+ * 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 <pault@gcc.gnu.org>
PR fortran/31213
diff --git a/gcc/fortran/error.c b/gcc/fortran/error.c
index e25a428..fa1a505 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;