From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Mon, 14 Apr 2014 09:29:09 +0000 (+0000)
Subject: pt.c (mark_template_parm): Use template_parm_level_and_index.
X-Git-Tag: releases/gcc-5.1.0~8150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8095617bca707740e241a6b2292a3d74317b3533;p=thirdparty%2Fgcc.git

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
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index bf61ab7564b1..5e1043bd1653 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 318c32507ef8..c74e7ae75860 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)
     {