decl.c (duplicate_decls): Convert use of warning_with_decl() to that of warning().

        * decl.c (duplicate_decls): Convert use of warning_with_decl() to
        that of warning().
        (start_decl): Likewise.
        (start_function): Likewise.

From-SVN: r63625

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c5db4812b0112d8db919d6e538ba405bc4cb2d69..25e6f1e6bf64391ad72e130a9bf457d016e3bc14 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-01  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+       * decl.c (duplicate_decls): Convert use of warning_with_decl() to
+       that of warning().
+       (start_decl): Likewise.
+       (start_function): Likewise.
+
 2003-03-01  Neil Booth  <neil@daikokuya.co.uk>
 
        * Make-lang.in (CXX_C_OBJS): Update.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index cd15f25315da52b2c8f40441c9f713f89256aaed..b2c2577fa49e666dc618035224fdef65e208479a 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -2981,19 +2981,19 @@ duplicate_decls (tree newdecl, tree olddecl)
               && DECL_UNINLINABLE (olddecl)
               && lookup_attribute ("noinline", DECL_ATTRIBUTES (olddecl)))
        {
-         warning_with_decl (newdecl,
-                            "function `%s' redeclared as inline");
-         warning_with_decl (olddecl,
-                            "previous declaration of function `%s' with attribute noinline");
+         warning ("%Hfunction '%D' redeclared as inline",
+                   &DECL_SOURCE_LOCATION (newdecl), newdecl);
+         warning ("%Hprevious declaration of '%D' with attribute noinline",
+                   &DECL_SOURCE_LOCATION (olddecl), olddecl);
        }
       else if (DECL_DECLARED_INLINE_P (olddecl)
               && DECL_UNINLINABLE (newdecl)
               && lookup_attribute ("noinline", DECL_ATTRIBUTES (newdecl)))
        {
-         warning_with_decl (newdecl,
-                            "function `%s' redeclared with attribute noinline");
-         warning_with_decl (olddecl,
-                            "previous declaration of function `%s' was inline");
+         warning ("%Hfunction '%D' redeclared with attribute noinline",
+                   &DECL_SOURCE_LOCATION (newdecl), newdecl);
+         warning ("%Hprevious declaration of '%D' was inline",
+                   &DECL_SOURCE_LOCATION (olddecl), olddecl);
        }
     }
 
@@ -7090,8 +7090,8 @@ start_decl (tree declarator,
       && DECL_DECLARED_INLINE_P (decl)
       && DECL_UNINLINABLE (decl)
       && lookup_attribute ("noinline", DECL_ATTRIBUTES (decl)))
-    warning_with_decl (decl,
-                      "inline function `%s' given attribute noinline");
+    warning ("%Hinline function '%D' given attribute noinline",
+             &DECL_SOURCE_LOCATION (decl), decl);
 
   if (context && COMPLETE_TYPE_P (complete_type (context)))
     {
@@ -13434,8 +13434,8 @@ start_function (tree declspecs, tree declarator, tree attrs, int flags)
 
   if (DECL_DECLARED_INLINE_P (decl1)
       && lookup_attribute ("noinline", attrs))
-    warning_with_decl (decl1,
-                      "inline function `%s' given attribute noinline");
+    warning ("%Hinline function '%D' given attribute noinline",
+             &DECL_SOURCE_LOCATION (decl1), decl1);
 
   if (DECL_MAYBE_IN_CHARGE_CONSTRUCTOR_P (decl1))
     /* This is a constructor, we must ensure that any default args