From dd2b44ff26c27d224b7aef46ee2a7155b82fe3a0 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@yorick.cygnus.com>
Date: Wed, 27 May 1998 23:06:46 +0000
Subject: [PATCH] * friend.c (do_friend): Clarify template warning.
From-SVN: r20108
---
gcc/cp/ChangeLog | 4 ++++
gcc/cp/friend.c | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 70caa2dd9d8e..f47ae9459ee0 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 8adeb600450e..c6f68bd07f03 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;
}
}
--
GitLab