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 5e5af5b4c488c2aee612c74f12c5f8df768c3568..3e1cd0dcd8e354a9ebc1979da2f0a9fb73ee706d 100644 (file)
--- 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);