From 7bf4741d80abb671c5d13b416f688a97f69c17d8 Mon Sep 17 00:00:00 2001 From: nickc Date: Mon, 14 May 2001 17:09:34 +0000 Subject: [PATCH] Suppress warning about duplicate decls if the first decl is a friend. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42073 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/cp/decl.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index edc4849..9bd83c1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2001-05-14 Nick Clifton + + * decl.c (duplicate_decls): Suppress warning about duplicate + decls if the first decl is a friend. + Mon May 14 17:34:48 CEST 2001 Jan Hubicka * i386.h (TARGET_64BIT): Define to constant if !TARGET_BI_ARCH diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 54d84f4..ee5c279 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -3457,7 +3457,7 @@ duplicate_decls (newdecl, olddecl) /* Don't warn about extern decl followed by definition. */ && !(DECL_EXTERNAL (olddecl) && ! DECL_EXTERNAL (newdecl)) /* Don't warn about friends, let add_friend take care of it. */ - && ! DECL_FRIEND_P (newdecl)) + && ! (DECL_FRIEND_P (newdecl) || DECL_FRIEND_P (olddecl))) { cp_warning ("redundant redeclaration of `%D' in same scope", newdecl); cp_warning_at ("previous declaration of `%D'", olddecl); -- 2.7.4