decl.c (duplicate_decls): Don't complain about different exceptions from an internal...

	* decl.c (duplicate_decls): Don't complain about different
	exceptions from an internal decl even if pedantic.

From-SVN: r21959

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index eeb2490..5a60b49 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 1998-08-25  Jason Merrill  <jason@yorick.cygnus.com>
 
+       * decl.c (duplicate_decls): Don't complain about different
+       exceptions from an internal decl even if pedantic.
+
        * typeck.c (convert_for_assignment): Converting from pm of vbase
        to derived is an error, not a sorry.
 

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 8d3d6d9..0179eaf 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -3021,8 +3021,8 @@ duplicate_decls (newdecl, olddecl)
          TREE_TYPE (olddecl) = build_exception_variant (newtype,
                                                         TYPE_RAISES_EXCEPTIONS (oldtype));
 
-         if ((pedantic || (! DECL_IN_SYSTEM_HEADER (olddecl)
-                           && DECL_SOURCE_LINE (olddecl) != 0))
+         if ((pedantic || ! DECL_IN_SYSTEM_HEADER (olddecl))
+             && DECL_SOURCE_LINE (olddecl) != 0
              && flag_exceptions
              && ! compexcepttypes (TREE_TYPE (newdecl), TREE_TYPE (olddecl)))
            {