From 796d0fa71e6989679f5fe7da62be877f27c3d5c9 Mon Sep 17 00:00:00 2001 From: nathan Date: Sat, 20 Sep 2003 19:30:51 +0000 Subject: [PATCH] apparently managed not to commit the crucial part of c++/12332 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71607 138bc75d-0d04-0410-961f-82ee72b054a4 --- 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 5e5af5b..3e1cd0d 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.7.4