diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-10-12 09:53:27 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-10-12 09:53:27 +0000 |
| commit | 2bb774598995f55f0b0f1b5691fe6a7c6ca561f9 (patch) | |
| tree | 1acff7e18d7b9538c37db008406b533e15552916 | |
| parent | 484b827b2ef32bd7c3e1b075e1e4344ba3aa402a (diff) | |
| download | ppe42-gcc-2bb774598995f55f0b0f1b5691fe6a7c6ca561f9.tar.gz ppe42-gcc-2bb774598995f55f0b0f1b5691fe6a7c6ca561f9.zip | |
2007-10-12 Paolo Carlini <pcarlini@suse.de>
* pt.c (tsubst): Use template_parm_level_and_index.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@129257 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 13 |
2 files changed, 5 insertions, 12 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index faea90d1e3c..075e2096dc9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2007-10-12 Paolo Carlini <pcarlini@suse.de> + + * pt.c (tsubst): Use template_parm_level_and_index. + 2007-10-12 Jakub Jelinek <jakub@redhat.com> PR c++/32121 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index fe2a739d40c..c3ce0d13734 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -8669,18 +8669,7 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl) r = NULL_TREE; gcc_assert (TREE_VEC_LENGTH (args) > 0); - if (TREE_CODE (t) == TEMPLATE_TYPE_PARM - || TREE_CODE (t) == TEMPLATE_TEMPLATE_PARM - || TREE_CODE (t) == BOUND_TEMPLATE_TEMPLATE_PARM) - { - idx = TEMPLATE_TYPE_IDX (t); - level = TEMPLATE_TYPE_LEVEL (t); - } - else - { - idx = TEMPLATE_PARM_IDX (t); - level = TEMPLATE_PARM_LEVEL (t); - } + template_parm_level_and_index (t, &level, &idx); levels = TMPL_ARGS_DEPTH (args); if (level <= levels) |
