DR 1004

	DR 1004
	* decl.c (make_unbound_class_template): Handle using
	injected-type-name as template.

From-SVN: r166850

gcc/cp/ChangeLog

+2010-11-16  Jason Merrill  <jason@redhat.com>
+
+	DR 1004
+	* decl.c (make_unbound_class_template): Handle using
+	injected-type-name as template.
+
 2010-11-15  Nicola Pero  <nicola.pero@meta-innovation.com>
 
 	* typeck.c (cp_build_unary_op): Use

gcc/cp/decl.c

@@ -3227,6 +3227,9 @@ make_unbound_class_template (tree context, tree name, tree parm_list,
       if (MAYBE_CLASS_TYPE_P (context))
 	tmpl = lookup_field (context, name, 0, false);
 
+      if (tmpl && TREE_CODE (tmpl) == TYPE_DECL)
+	tmpl = maybe_get_template_decl_from_type_decl (tmpl);
+
       if (!tmpl || !DECL_CLASS_TEMPLATE_P (tmpl))
 	{
 	  if (complain & tf_error)

gcc/testsuite/ChangeLog

+2010-11-16  Jason Merrill  <jason@redhat.com>
+
+	* g++.dg/template/injected2.C: New.
+
 2010-11-17  Nicola Pero  <nicola.pero@meta-innovation.com>
 
 	* objc.dg/protocol-optional-1.m: New.

gcc/testsuite/g++.dg/template/injected2.C

+// DR 1004
+
+template <class T, template<class>class U = T::template B> struct A { };
+
+template <class T> struct B {
+  template <class U> friend struct B;
+};
+
+A<B<int> > a;