Commit 2678bae8 by Volker Reichelt Committed by Volker Reichelt

pt.c (instantiate_class_template): Clean-up.

	* pt.c (instantiate_class_template): Clean-up.

From-SVN: r107499
parent 260cd73f
2005-11-25 Volker Reichelt <reichelt@igpm.rwth-aachen.de> 2005-11-25 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
* pt.c (instantiate_class_template): Clean-up.
2005-11-25 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
* pt.c (template_class_depth_real): Remove. Move functionality to ... * pt.c (template_class_depth_real): Remove. Move functionality to ...
(template_class_depth): ... here, replacing count_specializations (template_class_depth): ... here, replacing count_specializations
with 0. Adjust comment. with 0. Adjust comment.
......
...@@ -5653,14 +5653,12 @@ instantiate_class_template (tree type) ...@@ -5653,14 +5653,12 @@ instantiate_class_template (tree type)
{ {
/* Build new CLASSTYPE_NESTED_UTDS. */ /* Build new CLASSTYPE_NESTED_UTDS. */
tree tag = t;
tree name = TYPE_IDENTIFIER (tag);
tree newtag; tree newtag;
bool class_template_p; bool class_template_p;
class_template_p = (TREE_CODE (tag) != ENUMERAL_TYPE class_template_p = (TREE_CODE (t) != ENUMERAL_TYPE
&& TYPE_LANG_SPECIFIC (tag) && TYPE_LANG_SPECIFIC (t)
&& CLASSTYPE_IS_TEMPLATE (tag)); && CLASSTYPE_IS_TEMPLATE (t));
/* If the member is a class template, then -- even after /* If the member is a class template, then -- even after
substitution -- there may be dependent types in the substitution -- there may be dependent types in the
template argument list for the class. We increment template argument list for the class. We increment
...@@ -5669,7 +5667,7 @@ instantiate_class_template (tree type) ...@@ -5669,7 +5667,7 @@ instantiate_class_template (tree type)
when outside of a template. */ when outside of a template. */
if (class_template_p) if (class_template_p)
++processing_template_decl; ++processing_template_decl;
newtag = tsubst (tag, args, tf_error, NULL_TREE); newtag = tsubst (t, args, tf_error, NULL_TREE);
if (class_template_p) if (class_template_p)
--processing_template_decl; --processing_template_decl;
if (newtag == error_mark_node) if (newtag == error_mark_node)
...@@ -5677,6 +5675,8 @@ instantiate_class_template (tree type) ...@@ -5677,6 +5675,8 @@ instantiate_class_template (tree type)
if (TREE_CODE (newtag) != ENUMERAL_TYPE) if (TREE_CODE (newtag) != ENUMERAL_TYPE)
{ {
tree name = TYPE_IDENTIFIER (t);
if (class_template_p) if (class_template_p)
/* Unfortunately, lookup_template_class sets /* Unfortunately, lookup_template_class sets
CLASSTYPE_IMPLICIT_INSTANTIATION for a partial CLASSTYPE_IMPLICIT_INSTANTIATION for a partial
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment