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

pt.c (complete_template_args): Don't look at the context unless we have to.

Browse source 
* pt.c (complete_template_args): Don't look at the context unless
	we have to.

From-SVN: r21195
This commit is contained in:
Jason Merrill 1998-07-15 14:21:35 +00:00 • committed by Jason Merrill
parent 8d9eb1141f
commit 2077e863e2
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gcc/cp/ChangeLog
View file

@ -1,5 +1,8 @@
1998-07-15 Jason Merrill <jason@yorick.cygnus.com>
* pt.c (complete_template_args): Don't look at the context unless
we have too.
* method.c (build_decl_overload_real): Fix namespace handling.
* typeck.c (build_unary_op): Extract a lone function from an

23
gcc/cp/pt.c
View file

@ -484,18 +484,21 @@ complete_template_args (tmpl, extra_args, unbound_only)
template class, so skip over it. */
skip = (! is_member_template (tmpl));
type = DECL_REAL_CONTEXT (tmpl);
for (i = depth; i; type = TYPE_CONTEXT (type))
if (PRIMARY_TEMPLATE_P (CLASSTYPE_TI_TEMPLATE (type)))
{
if (skip)
skip = 0;
else
if (depth > skip)
{
type = DECL_REAL_CONTEXT (tmpl);
for (i = depth; i; type = TYPE_CONTEXT (type))
if (PRIMARY_TEMPLATE_P (CLASSTYPE_TI_TEMPLATE (type)))
{
--i;
TREE_VEC_ELT (new_args, i) = CLASSTYPE_TI_ARGS (type);
if (skip)
skip = 0;
else
{
--i;
TREE_VEC_ELT (new_args, i) = CLASSTYPE_TI_ARGS (type);
}
}
}
}
}
if (extra_arg_depth == 1)