OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DR 1004

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

From-SVN: r166850
This commit is contained in:
Jason Merrill 2010-11-16 20:43:02 -05:00 committed by Jason Merrill
parent b58a864da3
commit bf4c0738c0
4 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
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

3
gcc/cp/decl.c
View File

@ -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)

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
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.

9
gcc/testsuite/g++.dg/template/injected2.C Normal file
View File

@ -0,0 +1,9 @@
// 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;