aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@yorick.cygnus.com>1998-05-27 23:06:46 +0000
committerJason Merrill <jason@gcc.gnu.org>1998-05-27 19:06:46 -0400
commitdd2b44ff26c27d224b7aef46ee2a7155b82fe3a0 (patch)
treebee3f16d2dd688a7a91dc8766c37f747ba1e11bb /gcc
parent26963cc3e169e29e3deb2c9c66d1ceba51596db8 (diff)
downloadgcc-dd2b44ff26c27d224b7aef46ee2a7155b82fe3a0.zip
gcc-dd2b44ff26c27d224b7aef46ee2a7155b82fe3a0.tar.gz
gcc-dd2b44ff26c27d224b7aef46ee2a7155b82fe3a0.tar.bz2
* friend.c (do_friend): Clarify template warning.
From-SVN: r20108
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/friend.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 70caa2d..f47ae94 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+1998-05-27 Jason Merrill <jason@yorick.cygnus.com>
+
+ * friend.c (do_friend): Clarify template warning.
+
1998-05-27 Mark Mitchell <mark@markmitchell.com>
* decl.c (shadow_label): Don't treat decls as identifiers.
diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c
index 8adeb60..c6f68bd 100644
--- a/gcc/cp/friend.c
+++ b/gcc/cp/friend.c
@@ -430,8 +430,9 @@ do_friend (ctype, declarator, decl, parmdecls, flags, quals, funcdef_flag)
warning (" declares a non-template function");
if (! explained)
{
- warning (" unless you compile with -fguiding-decls");
- warning (" or add <> after the function name");
+ 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)");
explained = 1;
}
}