diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 89a6a7b..62e4fe4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -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 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index baabcb1..e220efe 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -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); |