From db3ef87b8a1858f77998a9e8a5275cc5755350d7 Mon Sep 17 00:00:00 2001 From: Kriang Lerdsuwanakij Date: Thu, 26 Jul 2001 12:48:01 +0000 Subject: pt.c (tsubst_template_parms): Call maybe_fold_nontype_arg and tsubst_expr for default template arguments. 2001-07-22 Kriang Lerdsuwanakij * pt.c (tsubst_template_parms): Call maybe_fold_nontype_arg and tsubst_expr for default template arguments. 2001-07-22 Kriang Lerdsuwanakij * g++.old-deja/g++.pt/defarg14.C: New test. From-SVN: r44396 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/pt.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'gcc/cp') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index dd1be64..7569249 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2001-07-26 Kriang Lerdsuwanakij + + * pt.c (tsubst_template_parms): Call maybe_fold_nontype_arg and + tsubst_expr for default template arguments. + 2001-07-26 Nathan Sidwell * spew.c (yylex): Only copy the token's lineno, if it is diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index d09ce8f..1f40089 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -5377,8 +5377,9 @@ tsubst_template_parms (parms, args, complain) TREE_VALUE (TREE_VEC_ELT (TREE_VALUE (parms), i)); TREE_VEC_ELT (new_vec, i) - = build_tree_list (tsubst (default_value, args, complain, - NULL_TREE), + = build_tree_list (maybe_fold_nontype_arg ( + tsubst_expr (default_value, args, complain, + NULL_TREE)), tsubst (parm_decl, args, complain, NULL_TREE)); } -- cgit v1.1