diff options
| author | Jason Merrill <jason@redhat.com> | 2003-12-18 14:53:10 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2003-12-18 14:53:10 -0500 |
| commit | 67c038330211765758b029aef423568374c9cd2e (patch) | |
| tree | 1a1f043dc430c24f12ce79de3e35296f79a7c965 /gcc/cp/pt.c | |
| parent | d11994a8c39186392711d06554dc5baab5dc3b72 (diff) | |
| download | gcc-67c038330211765758b029aef423568374c9cd2e.zip gcc-67c038330211765758b029aef423568374c9cd2e.tar.gz gcc-67c038330211765758b029aef423568374c9cd2e.tar.bz2 | |
re PR c++/12253 ([tree-ssa] ICE on conversion to std::string inside array initialization)
PR c++/12253
* init.c (build_vec_init): Initialization of an element from
an initializer list is also a full-expression.
* parser.c, pt.c, semantics.c: Rename constant_expression_p
to integral_constant_expression_p.
From-SVN: r74790
Diffstat (limited to 'gcc/cp/pt.c')
| -rw-r--r-- | gcc/cp/pt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 8445dce..9fbaa90 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -8052,7 +8052,7 @@ tsubst_copy_and_build (tree t, tree decl; cp_id_kind idk; tree qualifying_class; - bool non_constant_expression_p; + bool non_integral_constant_expression_p; const char *error_msg; if (IDENTIFIER_TYPENAME_P (t)) @@ -8072,9 +8072,9 @@ tsubst_copy_and_build (tree t, decl = finish_id_expression (t, decl, NULL_TREE, &idk, &qualifying_class, - /*constant_expression_p=*/false, - /*allow_non_constant_expression_p=*/false, - &non_constant_expression_p, + /*integral_constant_expression_p=*/false, + /*allow_non_integral_constant_expression_p=*/false, + &non_integral_constant_expression_p, &error_msg); if (error_msg) error (error_msg); |