MatCat.OpenSource/8sa1-gcc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pt.c (tsubst_friend_function): Push into namespace of friend function before pushdecl'ing it.

Browse Source 
* pt.c (tsubst_friend_function): Push into namespace of friend
	function before pushdecl'ing it.

From-SVN: r27520
This commit is contained in:
Martin v. Löwis 1999-06-14 15:56:12 +00:00 committed by Martin v. Löwis
parent bf4f78eef9
commit 92da7074de
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
1999-06-14 Martin von Löwis <loewis@informatik.hu-berlin.de>
* pt.c (tsubst_friend_function): Push into namespace of friend
function before pushdecl'ing it.
1999-06-14 Nathan Sidwell <nathan@acm.org> 1999-06-14 Nathan Sidwell <nathan@acm.org>
* call.c (build_new_op): Remove REF_BIND from all operands. * call.c (build_new_op): Remove REF_BIND from all operands.

7
gcc/cp/pt.c
View File

@ -4495,6 +4495,7 @@ tsubst_friend_function (decl, args)
tree old_decl; tree old_decl;
tree new_friend_template_info; tree new_friend_template_info;
tree new_friend_result_template_info; tree new_friend_result_template_info;
tree ns;
int new_friend_is_defn; int new_friend_is_defn;
/* We must save some information from NEW_FRIEND before calling /* We must save some information from NEW_FRIEND before calling
@ -4517,7 +4518,13 @@ tsubst_friend_function (decl, args)
new_friend_result_template_info = NULL_TREE; new_friend_result_template_info = NULL_TREE;
} }
/* Inside pushdecl_namespace_level, we will push into the
current namespace. However, the friend function should
tyically go into the namespace of the template. */
ns = decl_namespace_context (new_friend);
push_nested_namespace (ns);
old_decl = pushdecl_namespace_level (new_friend); old_decl = pushdecl_namespace_level (new_friend);
pop_nested_namespace (ns);
if (old_decl != new_friend) if (old_decl != new_friend)
{ {