diff options
Diffstat (limited to 'gcc/cp/init.c')
| -rw-r--r-- | gcc/cp/init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/cp/init.c b/gcc/cp/init.c index e2e547afd96..56715d6be97 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -812,7 +812,7 @@ perform_member_init (tree member, tree init) if (init && TREE_CODE (init) == TREE_LIST && (DIRECT_LIST_INIT_P (TREE_VALUE (init)) /* FIXME C++20 parenthesized aggregate init (PR 92812). */ - || !(/* cxx_dialect >= cxx2a ? CP_AGGREGATE_TYPE_P (type) */ + || !(/* cxx_dialect >= cxx20 ? CP_AGGREGATE_TYPE_P (type) */ /* : */CLASS_TYPE_P (type)))) init = build_x_compound_expr_from_list (init, ELK_MEM_INIT, tf_warning_or_error); @@ -2909,7 +2909,7 @@ build_new_constexpr_heap_type (tree elt_type, tree cookie_size, tree full_size) static tree maybe_wrap_new_for_constexpr (tree alloc_call, tree elt_type, tree cookie_size) { - if (cxx_dialect < cxx2a) + if (cxx_dialect < cxx20) return alloc_call; if (current_function_decl != NULL_TREE @@ -3611,7 +3611,7 @@ build_new_1 (vec<tree, va_gc> **placement, tree type, tree nelts, means allocate an int, and initialize it with 10. In C++20, also handle `new A(1, 2)'. */ - if (cxx_dialect >= cxx2a + if (cxx_dialect >= cxx20 && AGGREGATE_TYPE_P (type) && (*init)->length () > 1) { |