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

	* 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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3234883303225d40f1d0ec11d762dc9dffa16cc4..4f0b230a9628a18228fe09de616f5a7687968da3 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
 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.
 

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 046294e14862650a1ca6309c80dc48c91614422f..ceff84f0a06583d1ab698a4e97c9215ae4674050 100644 (file)
--- a/gcc/cp/pt.c
+++ b/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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 75bf1695f8395291c34776353ebccdbc0c9251a4..a7fd3521be662f49eb583cd59a1149097c0ec5ba 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,7 @@
 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>