diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index be8c865..992aaa9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +1999-04-12 Jason Merrill <jason@yorick.cygnus.com> + + * pt.c (lookup_template_class): Look through implict typename. + 1999-04-11 Mark Mitchell <mark@codesourcery.com> * friend.c (add_friend): Deal gracefully with error_mark_node. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 2988ed6..e8de776 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -3581,9 +3581,16 @@ lookup_template_class (d1, arglist, in_decl, context, entering_scope) } else if (TREE_CODE (d1) == TYPE_DECL && IS_AGGR_TYPE (TREE_TYPE (d1))) { - if (CLASSTYPE_TEMPLATE_INFO (TREE_TYPE (d1))) + tree type = TREE_TYPE (d1); + + /* If we are declaring a constructor, say A<T>::A<T>, we will get + an implicit typename for the second A. Deal with it. */ + if (TREE_CODE (type) == TYPENAME_TYPE && TREE_TYPE (type)) + type = TREE_TYPE (type); + + if (CLASSTYPE_TEMPLATE_INFO (type)) { - template = CLASSTYPE_TI_TEMPLATE (TREE_TYPE (d1)); + template = CLASSTYPE_TI_TEMPLATE (type); d1 = DECL_NAME (template); } } |