OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Paolo Carlini 2012-03-02 15:39:55 +00:00 committed by Paolo Carlini
parent 9f50723550
commit 54e9d9449d
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -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>
PR c++/51930

15
gcc/cp/name-lookup.c
View File

@ -4467,20 +4467,17 @@ binding_to_template_parms_of_scope_p (cxx_binding *binding,
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