diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2014-04-14 09:29:09 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2014-04-14 09:29:09 +0000 |
| commit | 8095617bca707740e241a6b2292a3d74317b3533 (patch) | |
| tree | d56478c28a1378521afe7cd434e6bfdbb6f648b5 | |
| parent | 8359c87e12157ec6a75026f2f90a7e032a3de30c (diff) | |
| download | gcc-8095617bca707740e241a6b2292a3d74317b3533.zip gcc-8095617bca707740e241a6b2292a3d74317b3533.tar.gz gcc-8095617bca707740e241a6b2292a3d74317b3533.tar.bz2 | |
pt.c (mark_template_parm): Use template_parm_level_and_index.
2014-04-14 Paolo Carlini <paolo.carlini@oracle.com>
* pt.c (mark_template_parm): Use template_parm_level_and_index.
From-SVN: r209360
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 11 |
2 files changed, 5 insertions, 10 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index bf61ab7..5e1043b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2014-04-14 Paolo Carlini <paolo.carlini@oracle.com> + + * pt.c (mark_template_parm): Use template_parm_level_and_index. + 2014-04-11 Jason Merrill <jason@redhat.com> * parser.h (struct cp_token): Rename ambiguous_p to error_reported. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 318c325..c74e7ae 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -4028,16 +4028,7 @@ mark_template_parm (tree t, void* data) int idx; struct template_parm_data* tpd = (struct template_parm_data*) data; - if (TREE_CODE (t) == TEMPLATE_PARM_INDEX) - { - level = TEMPLATE_PARM_LEVEL (t); - idx = TEMPLATE_PARM_IDX (t); - } - else - { - level = TEMPLATE_TYPE_LEVEL (t); - idx = TEMPLATE_TYPE_IDX (t); - } + template_parm_level_and_index (t, &level, &idx); if (level == tpd->level) { |