Commit 9a224b4a by Jason Merrill Committed by Jason Merrill

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

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
parent 51ddb82e
1998-08-25 Jason Merrill <jason@yorick.cygnus.com> 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 * typeck.c (convert_for_assignment): Converting from pm of vbase
to derived is an error, not a sorry. to derived is an error, not a sorry.
......
...@@ -3021,8 +3021,8 @@ duplicate_decls (newdecl, olddecl) ...@@ -3021,8 +3021,8 @@ duplicate_decls (newdecl, olddecl)
TREE_TYPE (olddecl) = build_exception_variant (newtype, TREE_TYPE (olddecl) = build_exception_variant (newtype,
TYPE_RAISES_EXCEPTIONS (oldtype)); TYPE_RAISES_EXCEPTIONS (oldtype));
if ((pedantic || (! DECL_IN_SYSTEM_HEADER (olddecl) if ((pedantic || ! DECL_IN_SYSTEM_HEADER (olddecl))
&& DECL_SOURCE_LINE (olddecl) != 0)) && DECL_SOURCE_LINE (olddecl) != 0
&& flag_exceptions && flag_exceptions
&& ! compexcepttypes (TREE_TYPE (newdecl), TREE_TYPE (olddecl))) && ! compexcepttypes (TREE_TYPE (newdecl), TREE_TYPE (olddecl)))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment