Suppress warning about duplicate decls if the first decl is a friend.

From-SVN: r42073

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index edc4849bd73d404f8107326d6fc9bb0e97408588..9bd83c16bb3178e61214b415170c29b38643668f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-14  Nick Clifton  <nickc@cambridge.redhat.com>
+
+       * 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  <jh@suse.cz>
 
        * i386.h (TARGET_64BIT): Define to constant if !TARGET_BI_ARCH

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 54d84f47ddda508fb29d81914cf46df7f0f9cc6c..ee5c279a3f62d9d38efe535b755cad28d8f35521 100644 (file)
--- 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);