pt.c (convert_template_argument): Revert this change: 2002-10-16 Mark Mitchell…

pt.c (convert_template_argument): Revert this change: 2002-10-16 Mark Mitchell <mark@codesourcery.com>

	* pt.c (convert_template_argument): Revert this change:
		2002-10-16  Mark Mitchell  <mark@codesourcery.com>
		* pt.c (convert_template_argument): Do not fold non-type
		template rguments when inside a template.

	* g++.dg/abi/mangle17.C: Adjust.

From-SVN: r58251

gcc/cp/ChangeLog

 2002-10-17  Mark Mitchell  <mark@codesourcery.com>
 
+	* pt.c (convert_template_argument): Revert this change:
+		2002-10-16  Mark Mitchell  <mark@codesourcery.com>
+		* pt.c (convert_template_argument): Do not fold non-type
+		template rguments when inside a template.
+
 	* init.c (expand_default_init): Handle brace-enclosed initializers
 	correctly.
 

gcc/cp/pt.c

@@ -3487,11 +3487,10 @@ convert_template_argument (parm, arg, args, complain, i, in_decl)
       if (invalid_nontype_parm_type_p (t, complain))
         return error_mark_node;
       
-      if (processing_template_decl && !abi_version_at_least (2))
+      if (processing_template_decl)
 	arg = maybe_fold_nontype_arg (arg);
 
-      if ((!abi_version_at_least (2) || !processing_template_decl)
-	  && (!uses_template_parms (arg) && !uses_template_parms (t)))
+      if (!uses_template_parms (arg) && !uses_template_parms (t))
 	/* We used to call digest_init here.  However, digest_init
 	   will report errors, which we don't want when complain
 	   is zero.  More importantly, digest_init will try too

gcc/testsuite/ChangeLog

 2002-10-17  Mark Mitchell  <mark@codesourcery.com>
 
+	* g++.dg/abi/mangle17.C: Adjust.
+
 	* g++.dg/init/array8.C: New test.
 
 2002-10-17  Richard Sandiford  <rsandifo@redhat.com>