aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Dos Reis <gdr@integrable-solutions.net>2003-03-01 21:12:49 +0000
committerGabriel Dos Reis <gdr@gcc.gnu.org>2003-03-01 21:12:49 +0000
commit456d88640c249ec8f27ce5672ed46f6021bd9668 (patch)
tree27650273c8f0b86523ed04df8a02ee77ae475ec9
parentd0efead7f33e3aea5e1db7ac6226fe12988692a0 (diff)
downloadgcc-456d88640c249ec8f27ce5672ed46f6021bd9668.zip
gcc-456d88640c249ec8f27ce5672ed46f6021bd9668.tar.gz
gcc-456d88640c249ec8f27ce5672ed46f6021bd9668.tar.bz2
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
-rw-r--r--gcc/cp/ChangeLog7
-rw-r--r--gcc/cp/decl.c24
2 files changed, 19 insertions, 12 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c5db481..25e6f1e 100644
--- 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 cd15f25..b2c2577 100644
--- 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