* friend.c (do_friend): Clarify template warning.

From-SVN: r20108

gcc/cp/ChangeLog

+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.

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;
 		}
 	    }