aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Kosnik <bkoz@gcc.gnu.org>1998-04-21 19:08:46 +0000
committerBenjamin Kosnik <bkoz@gcc.gnu.org>1998-04-21 19:08:46 +0000
commit70233af32f3b92405bfef17a9e845d9e194dc2df (patch)
tree2a77b9b5669203cd5e7887d64ee2ba02a6ba9a4a
parentdbf5190486ee46bb6c9f592a96f6b4d11e843689 (diff)
downloadgcc-70233af32f3b92405bfef17a9e845d9e194dc2df.zip
gcc-70233af32f3b92405bfef17a9e845d9e194dc2df.tar.gz
gcc-70233af32f3b92405bfef17a9e845d9e194dc2df.tar.bz2
decl.c (duplicate_decls): Only check DECL_FRIEND_P if function.
8 * decl.c (duplicate_decls): Only check DECL_FRIEND_P if function. g++/15307 redux From-SVN: r19362
-rw-r--r--gcc/cp/decl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 164d706..890c9f5 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -2794,7 +2794,7 @@ duplicate_decls (newdecl, olddecl)
/* Don't warn about extern decl followed by (tentative) definition. */
&& !(DECL_EXTERNAL (olddecl) && ! DECL_EXTERNAL (newdecl))
/* Don't warn about friends, let add_friend take care of it. */
- && ! DECL_FRIEND_P (newdecl))
+ && (TREE_CODE (newdecl) == FUNCTION_DECL && ! DECL_FRIEND_P (newdecl)))
{
cp_warning ("redundant redeclaration of `%D' in same scope", newdecl);
cp_warning_at ("previous declaration of `%D'", olddecl);