From: Nathan Sidwell <nathan@gcc.gnu.org>
Date: Sat, 20 Sep 2003 19:30:51 +0000 (+0000)
Subject: apparently managed not to commit the crucial part of c++/12332
X-Git-Tag: releases/gcc-3.4.0~3620
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fecafe5e0eb583e0aa7c3b314daa427efd5c57ef;p=thirdparty%2Fgcc.git

apparently managed not to commit the crucial part of c++/12332

From-SVN: r71607
---

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 5e5af5b4c488..3e1cd0dcd8e3 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);