diff options
| author | Jason Merrill <jason@redhat.com> | 2010-11-16 20:43:02 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2010-11-16 20:43:02 -0500 |
| commit | bf4c0738c0a3f8984feae12e7ef89f05793a35c9 (patch) | |
| tree | a712f3c8c70737bd3e5423e01b667f9f793352e7 /gcc | |
| parent | b58a864da35143bcacd42ba99846886213fdf78c (diff) | |
| download | gcc-bf4c0738c0a3f8984feae12e7ef89f05793a35c9.zip gcc-bf4c0738c0a3f8984feae12e7ef89f05793a35c9.tar.gz gcc-bf4c0738c0a3f8984feae12e7ef89f05793a35c9.tar.bz2 | |
DR 1004
DR 1004
* decl.c (make_unbound_class_template): Handle using
injected-type-name as template.
From-SVN: r166850
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/injected2.C | 9 |
4 files changed, 22 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index cdbec79..e32c3b7 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -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 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 714516e..55e0d6a 100644 --- a/gcc/cp/decl.c +++ b/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) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 01c6cb1..e40c1e9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -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. diff --git a/gcc/testsuite/g++.dg/template/injected2.C b/gcc/testsuite/g++.dg/template/injected2.C new file mode 100644 index 0000000..bd09ccc --- /dev/null +++ b/gcc/testsuite/g++.dg/template/injected2.C @@ -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; |