diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2002-10-17 17:07:15 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2002-10-17 17:07:15 +0000 |
| commit | d768a5895b5949df369fec4e91d7923ba7097261 (patch) | |
| tree | 40459654f2f770068521f2fdc4d058fe0d3baff5 /gcc | |
| parent | 4bf1d92ee071cd9e207fcf70c3fd78bf2f7dc2a5 (diff) | |
| download | gcc-d768a5895b5949df369fec4e91d7923ba7097261.zip gcc-d768a5895b5949df369fec4e91d7923ba7097261.tar.gz gcc-d768a5895b5949df369fec4e91d7923ba7097261.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3234883..4f0b230 100644 --- 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 046294e..ceff84f 100644 --- 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 75bf169..a7fd352 100644 --- 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> |