diff options
| author | Jason Merrill <jason@redhat.com> | 2012-04-16 22:29:35 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2012-04-16 22:29:35 -0400 |
| commit | 3ab97d92fc7e94b54411aa7629b13b4a4381304b (patch) | |
| tree | 0f20ec22367fc387890646dc32a8f606627a0427 | |
| parent | 99d4f8f70432e889eaa87f2a00a69f8b3481ff63 (diff) | |
| download | gcc-3ab97d92fc7e94b54411aa7629b13b4a4381304b.zip gcc-3ab97d92fc7e94b54411aa7629b13b4a4381304b.tar.gz gcc-3ab97d92fc7e94b54411aa7629b13b4a4381304b.tar.bz2 | |
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: r186520
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/variadic129.C | 19 |
4 files changed, 30 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3f2b999..24ce8e0 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -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. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 7423781..fcefc94 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -6428,6 +6428,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); @@ -6499,7 +6500,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); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 42e33c7..1ced5be 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -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. diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic129.C b/gcc/testsuite/g++.dg/cpp0x/variadic129.C new file mode 100644 index 0000000..7118301 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/variadic129.C @@ -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 |