diff options
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e68602f3e86..1557a7616ee 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2006-06-28 Jason Merrill <jason@redhat.com> + + PR c++/27424 + * pt.c (convert_template_argument): Pass all template arguments + on to coerce_template_template_parms. + 2006-06-25 Lee Millward <lee.millward@gmail.com> Mark Mitchell <mark@codesuorcery.com> diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 89afb5fe3b9..a81f6a05935 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -3837,11 +3837,8 @@ convert_template_argument (tree parm, tree in_decl) { tree val; - tree inner_args; int is_type, requires_type, is_tmpl_type, requires_tmpl_type; - inner_args = INNERMOST_TEMPLATE_ARGS (args); - if (TREE_CODE (arg) == TREE_LIST && TREE_CODE (TREE_VALUE (arg)) == OFFSET_REF) { @@ -3933,7 +3930,7 @@ convert_template_argument (tree parm, if (coerce_template_template_parms (parmparm, argparm, complain, in_decl, - inner_args)) + args)) { val = arg; |