From 77dbe50a010b308d80220330e13db567289ca19e Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 15 Jul 1999 00:29:16 +0000 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/decl.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 034b539fc763..12d6a48d42e9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +Thu Jul 15 01:26:49 1999 H.J. Lu + + * decl.c (duplicate_decls): Relax restriction for exception + checks on duplicate symbols. + 1999-07-07 Jason Merrill * decl.c (grokdeclarator): Update the names of all variants when diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 29fd717aacf0..24968d0a670c 100644 --- 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))) -- 2.47.2