2007-02-13 Dirk Mueller <dmueller@suse.de>

       * 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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b7d5973..342a7ba 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-13  Dirk Mueller  <dmueller@suse.de>
+
+       * 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  <simartin@users.sourceforge.net>
            Mark Mitchell  <mark@codesourcery.com>
 

diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c
index bc946e8..68484e5 100644 (file)
--- 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;
                }
            }