+2010-02-05 Dodji Seketeli <dodji@redhat.com>
+
+ PR c++/42915
+ * typeck.c (get_template_parms_of_dependent_type): Try getting
+ the template parameters fromt the type itself first.
+
2010-02-03 Jason Merrill <jason@redhat.com>
PR c++/4926
{
tree tinfo = NULL_TREE, tparms = NULL_TREE;
+ /* First, try the obvious case of getting the
+ template info from T itself. */
+ if ((tinfo = get_template_info (t)))
+ ;
/* If T1 is a typedef or whatever has a template info associated
to its context, get the template parameters from that context. */
- if (typedef_variant_p (t)
+ else if (typedef_variant_p (t)
&& DECL_CONTEXT (TYPE_NAME (t))
&& !NAMESPACE_SCOPE_P (TYPE_NAME (t)))
tinfo = get_template_info (DECL_CONTEXT (TYPE_NAME (t)));