diff options
| author | gdr <gdr@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-02-21 19:51:44 +0000 |
|---|---|---|
| committer | gdr <gdr@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-02-21 19:51:44 +0000 |
| commit | 76afd7f0588a2198749f3d27a7bfe06535032cdf (patch) | |
| tree | 593ca2207cb7f69371dcd4e6f5019f48dcabc847 /gcc/cp/friend.c | |
| parent | 70b4629deef9fe341ddded417ee578e863cf5dc1 (diff) | |
| download | gcc-76afd7f0588a2198749f3d27a7bfe06535032cdf.tar.gz | |
2000-02-21 Gabriel Dos Reis <gdr@codesourcery.com>
* call.c (build_object_call): Compress consecutive calls to
cp_error.
(build_conditional_expr): Say 'ISO C++' not 'ANSI C++'.
(build_op_delete_call): Adjust message formatting.
* class.c (check_bases): Compress consecutive calls to
cp_pedwarn.
(finish_struct_anon): Say 'ISO C++'.
* decl.c (start_decl): Same here.
(grok_reference_init): Likewise.
(grokfndecl): Correct message formatting.
(grokfndecl): Improve diagnostic.
(check_static_variable_definition): Likewise. Say 'ISO C++'
(compute_array_index_type): Say 'ISO C++'
(create_array_type_for_decl): Compress consecutive calls to
cp_error.
(grokdeclarator): Say 'ISO C++'
(grok_op_properties): Likewise.
* decl2.c (delete_sanity): Clairify diagnostic.
(check_member_template): Same here.
(grok_function_init): Use consistent terminology.
* expr.c (do_case): Say 'ISO C++'
* friend.c (do_friend): Compress consecutive calls to warning.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@32090 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/friend.c')
| -rw-r--r-- | gcc/cp/friend.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c index 1fc57949449..01c5d9438f2 100644 --- a/gcc/cp/friend.c +++ b/gcc/cp/friend.c @@ -410,10 +410,7 @@ do_friend (ctype, declarator, decl, parmdecls, attrlist, warning (" declares a non-template function"); if (! explained) { - warning (" (if this is not what you intended, make sure"); - warning (" the function template has already been declared,"); - warning (" and add <> after the function name here)"); - warning (" -Wno-non-template-friend disables this warning."); + warning (" (if this is not what you intended, make sure the function template has already been declared and add <> after the function name here) -Wno-non-template-friend disables this warning."); explained = 1; } } |