From 9a224b4a31946f5664d8af9a86ea2393163b91f7 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 25 Aug 1998 01:59:48 +0000 Subject: [PATCH] decl.c (duplicate_decls): Don't complain about different exceptions from an internal decl even if pedantic. * decl.c (duplicate_decls): Don't complain about different exceptions from an internal decl even if pedantic. From-SVN: r21959 --- gcc/cp/ChangeLog | 3 +++ gcc/cp/decl.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index eeb2490ea67..5a60b49f5f8 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 1998-08-25 Jason Merrill + * 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 8d3d6d9e492..0179eafdd26 100644 --- 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))) {