diff options
| author | gdr <gdr@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-03-26 20:05:55 +0000 |
|---|---|---|
| committer | gdr <gdr@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-03-26 20:05:55 +0000 |
| commit | 4cace8cb154743a6d3d3dea76a86851408021560 (patch) | |
| tree | f3e18bdb2050b0a57cf4c1c26efbb635fde19e95 /gcc/cp/name-lookup.c | |
| parent | 42ebeddc66c41c3f157c07c93398eac68198f9ac (diff) | |
| download | ppe42-gcc-4cace8cb154743a6d3d3dea76a86851408021560.tar.gz ppe42-gcc-4cace8cb154743a6d3d3dea76a86851408021560.zip | |
* cp-gimplify.c (cp_genericize_r): Use VAR_OR_FUNCTION_DECL_P.
* decl.c (duplicate_decls): Likewise.
(cp_finish_decl): Likewise.
(check_class_member_definition_namespace): Likewise.
* decl2.c (grokfield): Likewise.
(decl_needed_p): Likewise.
(import_export_decl): Likewise.
(mark_used): Likewise.
* name-lookup.c (pushdecl_maybe_friend_1): Likewise.
* pt.c (push_access_scope): Likewise.
(instantiate_decl): Likewise.
* ptree.c (cxx_print_decl): Likewise.
* repo.c (repo_emit_p): Likewise.
* semantics.c (note_decl_for_pch): Likewise.
* tree.c (decl_linkage): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@197119 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/name-lookup.c')
| -rw-r--r-- | gcc/cp/name-lookup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index dd6ef223def..0a0915af8a9 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -678,7 +678,7 @@ pushdecl_maybe_friend_1 (tree x, bool is_friend) block scope declaration declares that same entity and receives the linkage of the previous declaration. */ if (! t && current_function_decl && x != current_function_decl - && (TREE_CODE (x) == FUNCTION_DECL || TREE_CODE (x) == VAR_DECL) + && VAR_OR_FUNCTION_DECL_P (x) && DECL_EXTERNAL (x)) { /* Look in block scope. */ |
