name-lookup.c (binding_to_template_parms_of_scope_p): Clean up.
2012-03-02 Paolo Carlini <paolo.carlini@oracle.com> * name-lookup.c (binding_to_template_parms_of_scope_p): Clean up. From-SVN: r184792
This commit is contained in:
parent
9f50723550
commit
54e9d9449d
|
@ -1,3 +1,7 @@
|
||||||
|
2012-03-02 Paolo Carlini <paolo.carlini@oracle.com>
|
||||||
|
|
||||||
|
* name-lookup.c (binding_to_template_parms_of_scope_p): Clean up.
|
||||||
|
|
||||||
2012-02-29 Jason Merrill <jason@redhat.com>
|
2012-02-29 Jason Merrill <jason@redhat.com>
|
||||||
|
|
||||||
PR c++/51930
|
PR c++/51930
|
||||||
|
|
|
@ -4467,20 +4467,17 @@ binding_to_template_parms_of_scope_p (cxx_binding *binding,
|
||||||
cp_binding_level *scope)
|
cp_binding_level *scope)
|
||||||
{
|
{
|
||||||
tree binding_value;
|
tree binding_value;
|
||||||
|
tree tinfo;
|
||||||
|
|
||||||
if (!binding || !scope)
|
if (!binding || !scope || !scope->this_entity)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
binding_value = binding->value ? binding->value : binding->type;
|
binding_value = binding->value ? binding->value : binding->type;
|
||||||
|
tinfo = get_template_info (scope->this_entity);
|
||||||
|
|
||||||
return (scope
|
return (tinfo
|
||||||
&& scope->this_entity
|
&& PRIMARY_TEMPLATE_P (TI_TEMPLATE (tinfo))
|
||||||
&& get_template_info (scope->this_entity)
|
&& parameter_of_template_p (binding_value, TI_TEMPLATE (tinfo)));
|
||||||
&& PRIMARY_TEMPLATE_P (TI_TEMPLATE
|
|
||||||
(get_template_info (scope->this_entity)))
|
|
||||||
&& parameter_of_template_p (binding_value,
|
|
||||||
TI_TEMPLATE (get_template_info \
|
|
||||||
(scope->this_entity))));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Return the innermost non-namespace binding for NAME from a scope
|
/* Return the innermost non-namespace binding for NAME from a scope
|
||||||
|
|
Loading…
Reference in New Issue