From fecafe5e0eb583e0aa7c3b314daa427efd5c57ef Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Sat, 20 Sep 2003 19:30:51 +0000 Subject: [PATCH] apparently managed not to commit the crucial part of c++/12332 From-SVN: r71607 --- gcc/cp/pt.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 5e5af5b4c48..3e1cd0dcd8e 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -5280,8 +5280,13 @@ instantiate_class_template (tree type) || DECL_FUNCTION_TEMPLATE_P (t)) { /* Build new TYPE_METHODS. */ - - tree r = tsubst (t, args, tf_error, NULL_TREE); + tree r; + + if (TREE_CODE (t) == TEMPLATE_DECL) + processing_template_decl++; + r = tsubst (t, args, tf_error, NULL_TREE); + if (TREE_CODE (t) == TEMPLATE_DECL) + processing_template_decl--; set_current_access_from_decl (r); grok_special_member_properties (r); finish_member_declaration (r); -- 2.30.2