From b02f0a26d61ac4abbe77525cac889d05a98ef956 Mon Sep 17 00:00:00 2001 From: mueller Date: Mon, 12 Feb 2007 23:55:17 +0000 Subject: [PATCH] 2007-02-13 Dirk Mueller * friend.c (do_friend): Annotate warning about friend declarations in templates with OPT_Wnon_template_friend. Convert informal message from warning() to inform(). git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121867 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/friend.c | 11 +++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b7d5973..342a7ba 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2007-02-13 Dirk Mueller + + * friend.c (do_friend): Annotate warning about friend + declarations in templates with OPT_Wnon_template_friend. + Convert informal message from warning() to inform(). + 2007-02-12 Simon Martin Mark Mitchell diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c index bc946e8..68484e5 100644 --- a/gcc/cp/friend.c +++ b/gcc/cp/friend.c @@ -548,14 +548,13 @@ do_friend (tree ctype, tree declarator, tree decl, if (warn) { static int explained; - warning (0, "friend declaration %q#D declares a non-template " - "function", decl); + warning (OPT_Wnon_template_friend, "friend declaration " + "%q#D declares a non-template function", decl); if (! explained) { - warning (0, "(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"); + inform ("(if this is not what you intended, make sure " + "the function template has already been declared " + "and add <> after the function name here) "); explained = 1; } } -- 2.7.4