public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Martin Liska <marxin@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-6760] Fix Werror=format-diag with --disable-nls. Date: Thu, 20 Jan 2022 11:03:20 +0000 (GMT) [thread overview] Message-ID: <20220120110320.226F43857C6B@sourceware.org> (raw) https://gcc.gnu.org/g:6d51a27fb17d9dc4e583c119fd976d39e575180f commit r12-6760-g6d51a27fb17d9dc4e583c119fd976d39e575180f Author: Martin Liska <mliska@suse.cz> Date: Thu Jan 20 09:30:01 2022 +0100 Fix Werror=format-diag with --disable-nls. PR c++/104134 gcc/cp/ChangeLog: * error.cc (dump_aggr_type): Partially disable the warning. Diff: --- gcc/cp/error.cc | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/gcc/cp/error.cc b/gcc/cp/error.cc index 1ab0c25a477..e76842e1a2a 100644 --- a/gcc/cp/error.cc +++ b/gcc/cp/error.cc @@ -768,6 +768,14 @@ class_key_or_enum_as_string (tree t) return "struct"; } +/* Disable warnings about missing quoting in GCC diagnostics for + the pp_verbatim call. Their format strings deliberately don't + follow GCC diagnostic conventions. */ +#if __GNUC__ >= 10 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-diag" +#endif + /* Print out a class declaration T under the control of FLAGS, in the form `class foo'. */ @@ -851,6 +859,10 @@ dump_aggr_type (cxx_pretty_printer *pp, tree t, int flags) flags & ~TFF_TEMPLATE_HEADER); } +#if __GNUC__ >= 10 +#pragma GCC diagnostic pop +#endif + /* Dump into the obstack the initial part of the output for a given type. This is necessary when dealing with things like functions returning functions. Examples: @@ -3618,8 +3630,8 @@ function_category (tree fn) the pp_verbatim calls. Their format strings deliberately don't follow GCC diagnostic conventions. */ #if __GNUC__ >= 10 -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wformat-diag" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-diag" #endif /* Report the full context of a current template instantiation, @@ -4230,7 +4242,7 @@ add_quotes (const char *content, bool show_color) } #if __GNUC__ >= 10 -# pragma GCC diagnostic pop +#pragma GCC diagnostic pop #endif /* If we had %H and %I, and hence deferred printing them,
reply other threads:[~2022-01-20 11:03 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220120110320.226F43857C6B@sourceware.org \ --to=marxin@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).