diff options
Diffstat (limited to 'gcc/cp/class.c')
-rw-r--r-- | gcc/cp/class.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/cp/class.c b/gcc/cp/class.c index cd63c21..97e29c0 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -4317,7 +4317,7 @@ build_base_field (record_layout_info rli, tree binfo, back end issues with overlapping FIELD_DECLs, but that doesn't seem to be a problem anymore. We need them to handle initialization of C++17 aggregate bases. */ - if (cxx_dialect >= cxx1z && !BINFO_VIRTUAL_P (binfo)) + if (cxx_dialect >= cxx17 && !BINFO_VIRTUAL_P (binfo)) { tree decl = build_base_field_1 (t, basetype, next_field); DECL_FIELD_OFFSET (decl) = BINFO_OFFSET (binfo); @@ -5351,7 +5351,7 @@ finalize_literal_type_property (tree t) || TYPE_HAS_NONTRIVIAL_DESTRUCTOR (t)) CLASSTYPE_LITERAL_P (t) = false; else if (CLASSTYPE_LITERAL_P (t) && LAMBDA_TYPE_P (t)) - CLASSTYPE_LITERAL_P (t) = (cxx_dialect >= cxx1z); + CLASSTYPE_LITERAL_P (t) = (cxx_dialect >= cxx17); else if (CLASSTYPE_LITERAL_P (t) && !TYPE_HAS_TRIVIAL_DFLT (t) && CLASSTYPE_NON_AGGREGATE (t) && !TYPE_HAS_CONSTEXPR_CTOR (t)) @@ -5394,9 +5394,9 @@ explain_non_literal_class (tree t) return; inform (0, "%q+T is not literal because:", t); - if (cxx_dialect < cxx1z && LAMBDA_TYPE_P (t)) + if (cxx_dialect < cxx17 && LAMBDA_TYPE_P (t)) inform (0, " %qT is a closure type, which is only literal in " - "C++1z and later", t); + "C++17 and later", t); else if (TYPE_HAS_NONTRIVIAL_DESTRUCTOR (t)) inform (0, " %q+T has a non-trivial destructor", t); else if (CLASSTYPE_NON_AGGREGATE (t) |