public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Jason Merrill <jason@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-4756] diagnostic: rename new permerror overloads Date: Thu, 19 Oct 2023 15:49:59 +0000 (GMT) [thread overview] Message-ID: <20231019154959.483E3385841B@sourceware.org> (raw) https://gcc.gnu.org/g:1ec36bcda366732d3d801c67e9f70e2868b7d0e2 commit r14-4756-g1ec36bcda366732d3d801c67e9f70e2868b7d0e2 Author: Jason Merrill <jason@redhat.com> Date: Thu Oct 19 11:23:03 2023 -0400 diagnostic: rename new permerror overloads While checking another change, I noticed that the new permerror overloads break gettext with "permerror used incompatibly as both --keyword=permerror:2 --flag=permerror:2:gcc-internal-format and --keyword=permerror:3 --flag=permerror:3:gcc-internal-format". So let's change the name. gcc/ChangeLog: * diagnostic-core.h (permerror): Rename new overloads... (permerror_opt): To this. * diagnostic.cc: Likewise. gcc/cp/ChangeLog: * typeck2.cc (check_narrowing): Adjust. Diff: --- gcc/diagnostic-core.h | 7 ++++--- gcc/cp/typeck2.cc | 6 +++--- gcc/diagnostic.cc | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gcc/diagnostic-core.h b/gcc/diagnostic-core.h index 2d9909f18bdb..04eba3d140e6 100644 --- a/gcc/diagnostic-core.h +++ b/gcc/diagnostic-core.h @@ -105,9 +105,10 @@ extern bool pedwarn (rich_location *, int, const char *, ...) extern bool permerror (location_t, const char *, ...) ATTRIBUTE_GCC_DIAG(2,3); extern bool permerror (rich_location *, const char *, ...) ATTRIBUTE_GCC_DIAG(2,3); -extern bool permerror (location_t, int, const char *, ...) ATTRIBUTE_GCC_DIAG(3,4); -extern bool permerror (rich_location *, int, const char *, - ...) ATTRIBUTE_GCC_DIAG(3,4); +extern bool permerror_opt (location_t, int, const char *, ...) + ATTRIBUTE_GCC_DIAG(3,4); +extern bool permerror_opt (rich_location *, int, const char *, + ...) ATTRIBUTE_GCC_DIAG(3,4); extern void sorry (const char *, ...) ATTRIBUTE_GCC_DIAG(1,2); extern void sorry_at (location_t, const char *, ...) ATTRIBUTE_GCC_DIAG(2,3); extern void inform (location_t, const char *, ...) ATTRIBUTE_GCC_DIAG(2,3); diff --git a/gcc/cp/typeck2.cc b/gcc/cp/typeck2.cc index ab819d4e49d4..8e63fb1dc0e9 100644 --- a/gcc/cp/typeck2.cc +++ b/gcc/cp/typeck2.cc @@ -1109,9 +1109,9 @@ check_narrowing (tree type, tree init, tsubst_flags_t complain, else if (complain & tf_error) { int savederrorcount = errorcount; - permerror (loc, OPT_Wnarrowing, - "narrowing conversion of %qE from %qH to %qI", - init, ftype, type); + permerror_opt (loc, OPT_Wnarrowing, + "narrowing conversion of %qE from %qH to %qI", + init, ftype, type); if (errorcount == savederrorcount) ok = true; } diff --git a/gcc/diagnostic.cc b/gcc/diagnostic.cc index ecf1097bd2cc..0f392358aef6 100644 --- a/gcc/diagnostic.cc +++ b/gcc/diagnostic.cc @@ -2027,7 +2027,7 @@ permerror (rich_location *richloc, const char *gmsgid, ...) diagnostic can also be downgraded by -Wno-error=opt. */ bool -permerror (location_t location, int opt, const char *gmsgid, ...) +permerror_opt (location_t location, int opt, const char *gmsgid, ...) { auto_diagnostic_group d; va_list ap; @@ -2041,7 +2041,7 @@ permerror (location_t location, int opt, const char *gmsgid, ...) /* Same as "permerror" above, but at RICHLOC. */ bool -permerror (rich_location *richloc, int opt, const char *gmsgid, ...) +permerror_opt (rich_location *richloc, int opt, const char *gmsgid, ...) { gcc_assert (richloc);
reply other threads:[~2023-10-19 15:49 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=20231019154959.483E3385841B@sourceware.org \ --to=jason@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).