From: amodra Date: Thu, 24 Nov 2011 02:45:21 +0000 (+0000) Subject: * c-decl.c (warn_if_shadowing): Don't warn if shadowed X-Git-Tag: upstream/4.9.2~15945 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=10a45226d1da501b9686f48463fbd451bd9655b1;p=platform%2Fupstream%2Flinaro-gcc.git * c-decl.c (warn_if_shadowing): Don't warn if shadowed identifier is from system header. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@181684 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e678a7a..6787a7c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2011-11-24 Alan Modra + + * c-decl.c (warn_if_shadowing): Don't warn if shadowed + identifier is from system header. + 2011-11-23 Jakub Jelinek PR target/51261 @@ -104,7 +109,7 @@ PR c++/51264 * tree.c (iterative_hash_expr): Remove break after return. - + 2011-11-22 Iain Sandoe * target.def (tm_clone_table_section): New hook. diff --git a/gcc/c-decl.c b/gcc/c-decl.c index 3cb29c0..44358a8 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -2534,7 +2534,10 @@ warn_if_shadowing (tree new_decl) /* Is anything being shadowed? Invisible decls do not count. */ for (b = I_SYMBOL_BINDING (DECL_NAME (new_decl)); b; b = b->shadowed) - if (b->decl && b->decl != new_decl && !b->invisible) + if (b->decl && b->decl != new_decl && !b->invisible + && (b->decl == error_mark_node + || diagnostic_report_warnings_p (global_dc, + DECL_SOURCE_LOCATION (b->decl)))) { tree old_decl = b->decl;