pt.c (lookup_template_class_1): Use DECL_TYPE_TEMPLATE_P.

2014-08-01  Paolo Carlini  <paolo.carlini@oracle.com>

	* pt.c (lookup_template_class_1): Use DECL_TYPE_TEMPLATE_P.

From-SVN: r213433
This commit is contained in:
Paolo Carlini 2014-08-01 09:43:07 +00:00 committed by Paolo Carlini
parent 78f8727c3a
commit cd916532cf
2 changed files with 5 additions and 3 deletions

View File

@ -1,3 +1,7 @@
2014-08-01 Paolo Carlini <paolo.carlini@oracle.com>
* pt.c (lookup_template_class_1): Use DECL_TYPE_TEMPLATE_P.
2014-08-01 Jakub Jelinek <jakub@redhat.com>
* cp-gimplify.c (cp_genericize_r): For -fsanitize=null and/or

View File

@ -7414,9 +7414,7 @@ lookup_template_class_1 (tree d1, tree arglist, tree in_decl, tree context,
templ = TYPE_TI_TEMPLATE (d1);
d1 = DECL_NAME (templ);
}
else if (TREE_CODE (d1) == TEMPLATE_DECL
&& DECL_TEMPLATE_RESULT (d1)
&& TREE_CODE (DECL_TEMPLATE_RESULT (d1)) == TYPE_DECL)
else if (DECL_TYPE_TEMPLATE_P (d1))
{
templ = d1;
d1 = DECL_NAME (templ);