diff options
Diffstat (limited to 'gcc/cp/name-lookup.c')
| -rw-r--r-- | gcc/cp/name-lookup.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index 477cfb3..9b456d5 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -724,10 +724,10 @@ pushdecl_maybe_friend (tree x, bool is_friend) /* Don't do anything just yet. */; else if (t == wchar_decl_node) { - if (pedantic && ! DECL_IN_SYSTEM_HEADER (x)) - pedwarn ("redeclaration of %<wchar_t%> as %qT", + if (! DECL_IN_SYSTEM_HEADER (x)) + pedwarn (OPT_pedantic, "redeclaration of %<wchar_t%> as %qT", TREE_TYPE (x)); - + /* Throw away the redeclaration. */ POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, t); } @@ -796,10 +796,11 @@ pushdecl_maybe_friend (tree x, bool is_friend) x_exception_spec, true)) { - pedwarn ("declaration of %q#D with C language linkage", x); - pedwarn ("conflicts with previous declaration %q+#D", - previous); - pedwarn ("due to different exception specifications"); + pedwarn (0, "declaration of %q#D with C language linkage", + x); + pedwarn (0, "conflicts with previous declaration %q+#D", + previous); + pedwarn (0, "due to different exception specifications"); POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, error_mark_node); } } |