diff options
| author | Jason Merrill <jason@yorick.cygnus.com> | 1998-08-25 01:59:48 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1998-08-24 21:59:48 -0400 |
| commit | 9a224b4a31946f5664d8af9a86ea2393163b91f7 (patch) | |
| tree | a6b8674c91ae68d68aea6c026500a74f23129629 /gcc/cp | |
| parent | 51ddb82e4604cfdcc15d6a7b87b4bb713037205c (diff) | |
| download | gcc-9a224b4a31946f5664d8af9a86ea2393163b91f7.zip gcc-9a224b4a31946f5664d8af9a86ea2393163b91f7.tar.gz gcc-9a224b4a31946f5664d8af9a86ea2393163b91f7.tar.bz2 | |
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
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index eeb2490..5a60b49 100644 --- 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 --- 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))) { |