procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2011-10-28 Paolo Carlini <paolo.carlini@oracle.com>

Browse source 
Revert Fix for c++/50864.

From-SVN: r180640
This commit is contained in:
Paolo Carlini 2011-10-29 00:06:34 +00:00
parent f6d3d0fd4f
commit dec3d2a0af
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gcc/cp/pt.c
View file

@ -13741,12 +13741,14 @@ tsubst_copy_and_build (tree t,
else if (TREE_CODE (member) == SCOPE_REF
&& TREE_CODE (TREE_OPERAND (member, 1)) == TEMPLATE_ID_EXPR)
{
tree tmpl;
tree args;
/* Lookup the template functions now that we know what the
scope is. */
tree scope = TREE_OPERAND (member, 0);
tree tmpl = TREE_OPERAND (TREE_OPERAND (member, 1), 0);
tree args = TREE_OPERAND (TREE_OPERAND (member, 1), 1);
member = lookup_qualified_name (scope, tmpl,
tmpl = TREE_OPERAND (TREE_OPERAND (member, 1), 0);
args = TREE_OPERAND (TREE_OPERAND (member, 1), 1);
member = lookup_qualified_name (TREE_OPERAND (member, 0), tmpl,
/*is_type_p=*/false,
/*complain=*/false);
if (BASELINK_P (member))
@ -13760,7 +13762,7 @@ tsubst_copy_and_build (tree t,
}
else
{
qualified_name_lookup_error (scope, tmpl, member,
qualified_name_lookup_error (object_type, tmpl, member,
input_location);
return error_mark_node;
}