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

re PR c++/50830 ([c++0x] Variadic template, inner class error) 

PR c++/50830
	* pt.c (convert_template_argument): Handle template template
	argument packs.

From-SVN: r186532
This commit is contained in:
Jason Merrill 2012-04-17 10:11:13 -04:00 committed by Jason Merrill
parent 5a1b0c4398
commit 71b17ff5fc
4 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,5 +1,9 @@
2012-04-16 Jason Merrill <jason@redhat.com>
PR c++/50830
* pt.c (convert_template_argument): Handle template template
argument packs.
PR c++/50303
* pt.c (tsubst_pack_expansion): Use tsubst_expr for template
template parameters.

5
gcc/cp/pt.c
View File

@ -6437,6 +6437,7 @@ convert_template_argument (tree parm,
is_tmpl_type =
((TREE_CODE (arg) == TEMPLATE_DECL
&& TREE_CODE (DECL_TEMPLATE_RESULT (arg)) == TYPE_DECL)
|| (requires_tmpl_type && TREE_CODE (arg) == TYPE_ARGUMENT_PACK)
|| TREE_CODE (arg) == TEMPLATE_TEMPLATE_PARM
|| TREE_CODE (arg) == UNBOUND_CLASS_TEMPLATE);
@ -6508,7 +6509,9 @@ convert_template_argument (tree parm,
{
if (requires_tmpl_type)
{
if (TREE_CODE (TREE_TYPE (arg)) == UNBOUND_CLASS_TEMPLATE)
if (template_parameter_pack_p (parm) && ARGUMENT_PACK_P (orig_arg))
val = orig_arg;
else if (TREE_CODE (TREE_TYPE (arg)) == UNBOUND_CLASS_TEMPLATE)
/* The number of argument required is not known yet.
Just accept it for now. */
val = TREE_TYPE (arg);

3
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,8 @@
2012-04-16 Jason Merrill <jason@redhat.com>
PR c++/50830
* g++.dg/cpp0x/variadic129.C: New.
PR c++/50303
* g++.dg/cpp0x/variadic128.C: New.

19
gcc/testsuite/g++.dg/cpp0x/variadic129.C Normal file
View File

@ -0,0 +1,19 @@
// PR c++/50830
// { dg-do compile { target c++11 } }
template<template<class> class...>
struct list_templates {};
template<class>
struct aa {};
template<class... T>
struct test {};
template<template<class> class... F, class T>
struct test<list_templates<F...>, T>
{
struct inner {};
};
test<list_templates<aa>, int> a4; // error