decl.c (duplicate_decls): Relax restriction for exception checks on duplicate symbols.

        * decl.c (duplicate_decls): Relax restriction for exception
        checks on duplicate symbols.

From-SVN: r28108

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 034b539fc7637638494254090a241985d1bdd237..12d6a48d42e953ba2e9a2c1a6d9c0f1b6faca97a 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 15 01:26:49 1999  H.J. Lu  <hjl@gnu.org>
+
+       * decl.c (duplicate_decls): Relax restriction for exception
+       checks on duplicate symbols.
+
 1999-07-07  Jason Merrill  <jason@yorick.cygnus.com>
 
        * decl.c (grokdeclarator): Update the names of all variants when

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 29fd717aacf03a9f301ea0cb1f86baea9758d570..24968d0a670c71e00b2a8d8742fbea07ce49f9aa 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -3516,7 +3516,8 @@ duplicate_decls (newdecl, olddecl)
          TREE_TYPE (olddecl) = build_exception_variant (newtype,
                                                         TYPE_RAISES_EXCEPTIONS (oldtype));
 
-         if ((pedantic || ! DECL_IN_SYSTEM_HEADER (olddecl))
+         if ((pedantic || (! DECL_IN_SYSTEM_HEADER (olddecl)
+                           && ! DECL_IN_SYSTEM_HEADER (newdecl)))
              && DECL_SOURCE_LINE (olddecl) != 0
              && flag_exceptions
              && ! compexcepttypes (TREE_TYPE (newdecl), TREE_TYPE (olddecl)))