mirror of git://gcc.gnu.org/git/gcc.git
pt.c (tsubst_copy_and_build): Fix qualified_name_lookup_error call in case COMPONENT_REF.
2011-11-07 Paolo Carlini <paolo.carlini@oracle.com> * pt.c (tsubst_copy_and_build): Fix qualified_name_lookup_error call in case COMPONENT_REF. From-SVN: r181124
This commit is contained in:
parent
c8694a801c
commit
5a0626d162
|
@ -1,3 +1,8 @@
|
||||||
|
2011-11-07 Paolo Carlini <paolo.carlini@oracle.com>
|
||||||
|
|
||||||
|
* pt.c (tsubst_copy_and_build): Fix qualified_name_lookup_error
|
||||||
|
call in case COMPONENT_REF.
|
||||||
|
|
||||||
2011-11-07 Jason Merrill <jason@redhat.com>
|
2011-11-07 Jason Merrill <jason@redhat.com>
|
||||||
Dodji Seketeli <dodji@redhat.com>
|
Dodji Seketeli <dodji@redhat.com>
|
||||||
|
|
||||||
|
|
12
gcc/cp/pt.c
12
gcc/cp/pt.c
|
@ -13894,14 +13894,12 @@ tsubst_copy_and_build (tree t,
|
||||||
else if (TREE_CODE (member) == SCOPE_REF
|
else if (TREE_CODE (member) == SCOPE_REF
|
||||||
&& TREE_CODE (TREE_OPERAND (member, 1)) == TEMPLATE_ID_EXPR)
|
&& TREE_CODE (TREE_OPERAND (member, 1)) == TEMPLATE_ID_EXPR)
|
||||||
{
|
{
|
||||||
tree tmpl;
|
|
||||||
tree args;
|
|
||||||
|
|
||||||
/* Lookup the template functions now that we know what the
|
/* Lookup the template functions now that we know what the
|
||||||
scope is. */
|
scope is. */
|
||||||
tmpl = TREE_OPERAND (TREE_OPERAND (member, 1), 0);
|
tree scope = TREE_OPERAND (member, 0);
|
||||||
args = TREE_OPERAND (TREE_OPERAND (member, 1), 1);
|
tree tmpl = TREE_OPERAND (TREE_OPERAND (member, 1), 0);
|
||||||
member = lookup_qualified_name (TREE_OPERAND (member, 0), tmpl,
|
tree args = TREE_OPERAND (TREE_OPERAND (member, 1), 1);
|
||||||
|
member = lookup_qualified_name (scope, tmpl,
|
||||||
/*is_type_p=*/false,
|
/*is_type_p=*/false,
|
||||||
/*complain=*/false);
|
/*complain=*/false);
|
||||||
if (BASELINK_P (member))
|
if (BASELINK_P (member))
|
||||||
|
@ -13915,7 +13913,7 @@ tsubst_copy_and_build (tree t,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
qualified_name_lookup_error (object_type, tmpl, member,
|
qualified_name_lookup_error (scope, tmpl, member,
|
||||||
input_location);
|
input_location);
|
||||||
return error_mark_node;
|
return error_mark_node;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue