OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

decl.c (duplicate_decls): Don't complain about different exceptions from an internal decl even if pedantic.

Browse Source 
* decl.c (duplicate_decls): Don't complain about different
	exceptions from an internal decl even if pedantic.

From-SVN: r21959
This commit is contained in:
Jason Merrill 1998-08-25 01:59:48 +00:00 committed by Jason Merrill
parent 51ddb82e46
commit 9a224b4a31
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/cp/ChangeLog
View File

@ -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.

4
gcc/cp/decl.c
View File

@ -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)))
{