mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-22 11:31:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

decl.c (wrapup_globals_for_namespace): Use DECL_SOURCE_LOCATION and "%qF" in warning_at instead of "%q+F" in warning.

Browse Source 
2016-06-15  Paolo Carlini  <paolo.carlini@oracle.com>

	* decl.c (wrapup_globals_for_namespace): Use DECL_SOURCE_LOCATION and
	"%qF" in warning_at instead of "%q+F" in warning.
	(check_redeclaration_exception_specification): Likewise in pedwarn
	(and error, inform, for consistency).
	* call.c (joust): Likewise.

From-SVN: r237496
This commit is contained in:
Paolo Carlini 2016-06-15 20:13:39 +00:00 committed by Paolo Carlini
parent d7e16fc536
commit c5f914a3c7
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/cp/ChangeLog
View File

@ -1,3 +1,11 @@
2016-06-15 Paolo Carlini <paolo.carlini@oracle.com>
* decl.c (wrapup_globals_for_namespace): Use DECL_SOURCE_LOCATION and
"%qF" in warning_at instead of "%q+F" in warning.
(check_redeclaration_exception_specification): Likewise in pedwarn
(and error, inform, for consistency).
* call.c (joust): Likewise.
2016-06-15 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/70202

8
gcc/cp/call.c
View File

@ -9495,10 +9495,10 @@ joust (struct z_candidate *cand1, struct z_candidate *cand2, bool warn,
"default argument mismatch in "
"overload resolution"))
{
inform (input_location,
" candidate 1: %q+#F", cand1->fn);
inform (input_location,
" candidate 2: %q+#F", cand2->fn);
inform (DECL_SOURCE_LOCATION (cand1->fn),
" candidate 1: %q#F", cand1->fn);
inform (DECL_SOURCE_LOCATION (cand2->fn),
" candidate 2: %q#F", cand2->fn);
}
}
else

17
gcc/cp/decl.c
View File

@ -914,8 +914,9 @@ wrapup_globals_for_namespace (tree name_space, void* data ATTRIBUTE_UNUSED)
&& !DECL_ARTIFICIAL (decl)
&& !TREE_NO_WARNING (decl))
{
warning (OPT_Wunused_function,
"%q+F declared %<static%> but never defined", decl);
warning_at (DECL_SOURCE_LOCATION (decl),
OPT_Wunused_function,
"%qF declared %<static%> but never defined", decl);
TREE_NO_WARNING (decl) = 1;
}
}
@ -1233,18 +1234,20 @@ check_redeclaration_exception_specification (tree new_decl,
&& !comp_except_specs (new_exceptions, old_exceptions, ce_normal))
{
const char *msg
= "declaration of %q+F has a different exception specifier";
= "declaration of %qF has a different exception specifier";
bool complained = true;
location_t new_loc = DECL_SOURCE_LOCATION (new_decl);
if (DECL_IN_SYSTEM_HEADER (old_decl))
complained = pedwarn (0, OPT_Wsystem_headers, msg, new_decl);
complained = pedwarn (new_loc, OPT_Wsystem_headers, msg, new_decl);
else if (!flag_exceptions)
/* We used to silently permit mismatched eh specs with
-fno-exceptions, so make them a pedwarn now. */
complained = pedwarn (0, OPT_Wpedantic, msg, new_decl);
complained = pedwarn (new_loc, OPT_Wpedantic, msg, new_decl);
else
error (msg, new_decl);
error_at (new_loc, msg, new_decl);
if (complained)
inform (0, "from previous declaration %q+F", old_decl);
inform (DECL_SOURCE_LOCATION (old_decl),
"from previous declaration %qF", old_decl);
}
}