From: Jason Merrill Date: Tue, 25 Aug 1998 09:47:30 +0000 (-0600) Subject: decl.c (duplicate_decls): Don't complain about different exceptions from an internal... X-Git-Tag: prereleases/egcs-1.1-prerelease~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47908a7fca81cd54136a8ea75030eb758c79ee5a;p=thirdparty%2Fgcc.git decl.c (duplicate_decls): Don't complain about different exceptions from an internal decl even if pedantic. 8 * decl.c (duplicate_decls): Don't complain about different exceptions from an internal decl even if pedantic. From-SVN: r21963 --- diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 4ffe6d97358b..496158d942b4 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -2991,8 +2991,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))) {