diff options
| author | Jason Merrill <jason@redhat.com> | 2011-05-25 15:51:54 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-05-25 15:51:54 -0400 |
| commit | ce9b1898e5516ed5cdc444f1c0de82de34939181 (patch) | |
| tree | 4479a705d9bb9315f2625bd328fe3e0aeca05493 /gcc/cp/pt.c | |
| parent | 5e24286319abceaee8846843c89c5c6332d25e51 (diff) | |
| download | gcc-ce9b1898e5516ed5cdc444f1c0de82de34939181.zip gcc-ce9b1898e5516ed5cdc444f1c0de82de34939181.tar.gz gcc-ce9b1898e5516ed5cdc444f1c0de82de34939181.tar.bz2 | |
re PR c++/46245 ([C++0x] rejects function with late-specified return type as a non-type template parameter)
PR c++/46245
* decl.c (grokdeclarator): Complain later for auto parameter.
* pt.c (splice_late_return_type): Handle use in a template
type-parameter.
From-SVN: r174227
Diffstat (limited to 'gcc/cp/pt.c')
| -rw-r--r-- | gcc/cp/pt.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index bb4515b..c3c759e 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -19315,7 +19315,12 @@ splice_late_return_type (tree type, tree late_return_type) return type; argvec = make_tree_vec (1); TREE_VEC_ELT (argvec, 0) = late_return_type; - if (processing_template_decl) + if (processing_template_parmlist) + /* For a late-specified return type in a template type-parameter, we + need to add a dummy argument level for its parmlist. */ + argvec = add_to_template_args + (make_tree_vec (processing_template_parmlist), argvec); + if (current_template_parms) argvec = add_to_template_args (current_template_args (), argvec); return tsubst (type, argvec, tf_warning_or_error, NULL_TREE); } |