procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert previous change and use pragma to suppress -Wformat-diag.

Browse source 
gcc/cp/ChangeLog:

	* error.c (add_quotes): Revert previous change and use pragma to
	suppress -Wformat-diag.
This commit is contained in:
Martin Sebor 2020-11-27 16:04:30 -07:00
parent 9ccffd1298
commit fb6b29c85c
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gcc/cp/error.c
View file

@ -4061,10 +4061,6 @@ print_template_differences (pretty_printer *pp, tree type_a, tree type_b,
pp_printf (pp, ">");
}
#if __GNUC__ >= 10
# pragma GCC diagnostic pop
#endif
/* As type_to_string, but for a template, potentially colorizing/eliding
in comparison with PEER.
For example, if TYPE is map<int,double> and PEER is map<int,int>,
@ -4164,16 +4160,18 @@ add_quotes (const char *content, bool show_color)
pretty_printer tmp_pp;
pp_show_color (&tmp_pp) = show_color;
/* We use pp_quote & pp_string rather than pp_printf with "%<%s%>"
or "%qs" here in order to avoid quoting colorization bytes within
the results, and to avoid -Wformat-diag. */
pp_quote (&tmp_pp);
pp_string (&tmp_pp, content);
pp_quote (&tmp_pp);
/* We have to use "%<%s%>" rather than "%qs" here in order to avoid
quoting colorization bytes within the results and using either
pp_quote or pp_begin_quote doesn't work the same. */
pp_printf (&tmp_pp, "%<%s%>", content);
return pp_ggc_formatted_text (&tmp_pp);
}
#if __GNUC__ >= 10
# pragma GCC diagnostic pop
#endif
/* If we had %H and %I, and hence deferred printing them,
print them now, storing the result into the chunk_info
for pp_format. Quote them if 'q' was provided.