diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index dacc0f9..b8c4030 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2013-03-29 Gabriel Dos Reis <gdr@integrable-solutions.net> + + * pt.c (template_parms_to_args): Fix typo in comment. + 2013-03-29 Paolo Carlini <paolo.carlini@oracle.com> * call.c (build_op_call_1): Use TYPE_PTRFN_P and TYPE_REFFN_P. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 532e761..b5d5703 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -3874,10 +3874,10 @@ template_parms_to_args (tree parms) Consider the level of the parms of TT; T and U both have level 2; TT has no template parm of level 1. So in this case the first element of full_template_args is NULL_TREE. If we - leave it like this TMPL_ARG_DEPTH on args returns 1 instead + leave it like this TMPL_ARGS_DEPTH on args returns 1 instead of 2. This will make tsubst wrongly consider that T and U have level 1. Instead, let's create a dummy vector as the - first element of full_template_args so that TMPL_ARG_DEPTH + first element of full_template_args so that TMPL_ARGS_DEPTH returns the correct depth for args. */ TREE_VEC_ELT (args, 0) = make_tree_vec (1); return args; |