+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>
PR c++/51930
cp_binding_level *scope)
{
tree binding_value;
+ tree tinfo;
- if (!binding || !scope)
+ if (!binding || !scope || !scope->this_entity)
return false;
binding_value = binding->value ? binding->value : binding->type;
+ tinfo = get_template_info (scope->this_entity);
- return (scope
- && scope->this_entity
- && get_template_info (scope->this_entity)
- && 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 (tinfo
+ && PRIMARY_TEMPLATE_P (TI_TEMPLATE (tinfo))
+ && parameter_of_template_p (binding_value, TI_TEMPLATE (tinfo)));
}
/* Return the innermost non-namespace binding for NAME from a scope