diff options
| author | Jason Merrill <jason@redhat.com> | 2023-10-19 11:23:03 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2023-10-19 11:44:13 -0400 |
| commit | 1ec36bcda366732d3d801c67e9f70e2868b7d0e2 (patch) | |
| tree | a12cc92a1f0128f5e02dccab75c48da20cdd25c8 /gcc/cp | |
| parent | f53de2baae5a6992d93d58951c4c0a25ee678091 (diff) | |
| download | gcc-1ec36bcda366732d3d801c67e9f70e2868b7d0e2.zip gcc-1ec36bcda366732d3d801c67e9f70e2868b7d0e2.tar.gz gcc-1ec36bcda366732d3d801c67e9f70e2868b7d0e2.tar.bz2 | |
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.
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/typeck2.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/cp/typeck2.cc b/gcc/cp/typeck2.cc index ab819d4..8e63fb1 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; } |