From 18767f6502134a72689c3b7be96723a0c03a6a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20L=C3=B3pez-Ib=C3=A1=C3=B1ez?= Date: Wed, 20 Aug 2014 23:07:29 +0000 Subject: re PR fortran/44054 (Handle -Werror, -Werror=, -fdiagnostics-show-option, !GCC$ diagnostic (pragmas) and color) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gcc/ChangeLog: 2014-08-21 Manuel López-Ibáñez PR fortran/44054 * diagnostic.c (default_diagnostic_finalizer): Move caret printing to here ... (diagnostic_report_diagnostic): ... from here. * toplev.c (general_init): Move code to c-family. gcc/cp/ChangeLog: 2014-08-21 Manuel López-Ibáñez PR fortran/44054 * error.c (cp_diagnostic_finalizer): Delete. (init_error): Do not set diagnostic_finalizer here. gcc/c-family/ChangeLog: 2014-08-21 Manuel López-Ibáñez PR fortran/44054 * c-opts.c: Include tree-diagnostics.h. (c_diagnostic_finalizer): New. (c_common_initialize_diagnostics): Use it. gcc/fortran/ChangeLog: 2014-08-21 Manuel López-Ibáñez PR fortran/44054 * error.c (gfc_diagnostic_finalizer): Call default finalizer. From-SVN: r214245 --- gcc/cp/error.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'gcc/cp/error.c') diff --git a/gcc/cp/error.c b/gcc/cp/error.c index 2ce6490..9f0498d 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -99,7 +99,6 @@ static void print_instantiation_partial_context (diagnostic_context *, struct tinst_level *, location_t); static void cp_diagnostic_starter (diagnostic_context *, diagnostic_info *); -static void cp_diagnostic_finalizer (diagnostic_context *, diagnostic_info *); static void cp_print_error_function (diagnostic_context *, diagnostic_info *); static bool cp_printer (pretty_printer *, text_info *, const char *, @@ -109,7 +108,7 @@ void init_error (void) { diagnostic_starter (global_dc) = cp_diagnostic_starter; - diagnostic_finalizer (global_dc) = cp_diagnostic_finalizer; + /* diagnostic_finalizer is already c_diagnostic_finalizer. */ diagnostic_format_decoder (global_dc) = cp_printer; new (cxx_pp) cxx_pretty_printer (); @@ -3041,14 +3040,6 @@ cp_diagnostic_starter (diagnostic_context *context, diagnostic)); } -static void -cp_diagnostic_finalizer (diagnostic_context *context, - diagnostic_info *diagnostic) -{ - virt_loc_aware_diagnostic_finalizer (context, diagnostic); - pp_destroy_prefix (context->printer); -} - /* Print current function onto BUFFER, in the process of reporting a diagnostic message. Called from cp_diagnostic_starter. */ static void -- cgit v1.1