aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/diagnostic.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index afac973..7da0aca 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-02 Nathan Sidwell <nathan@acm.org>
+
+ * diagnostic.c (diagnostic_report_diagnostic): Remove extraneous
+ braces.
+
2016-12-02 Aldy Hernandez <aldyh@redhat.com>
PR middle-end/78328
diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c
index 2304e14..4278a10 100644
--- a/gcc/diagnostic.c
+++ b/gcc/diagnostic.c
@@ -834,9 +834,7 @@ diagnostic_report_diagnostic (diagnostic_context *context,
-Wno-error=*. */
if (context->warning_as_error_requested
&& diagnostic->kind == DK_WARNING)
- {
- diagnostic->kind = DK_ERROR;
- }
+ diagnostic->kind = DK_ERROR;
if (diagnostic->option_index
&& diagnostic->option_index != permissive_error_option (context))