From fc71e66e5186fb75206290deca2b9a6cfbefa9ac Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Sat, 12 Jun 2021 09:59:08 -0400 Subject: add upstream 11.11 --- zen/string_base.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'zen/string_base.h') diff --git a/zen/string_base.h b/zen/string_base.h index f0899433..5c17fb47 100644 --- a/zen/string_base.h +++ b/zen/string_base.h @@ -10,7 +10,7 @@ #include #include #include "string_tools.h" -#include "legacy_compiler.h" //constinit2 +#include "legacy_compiler.h" //constinit //Zbase - a policy based string class optimizing performance and flexibility @@ -209,7 +209,7 @@ private: static_assert(offsetof(GlobalEmptyString, nullTerm) - offsetof(GlobalEmptyString, descr) == sizeof(Descriptor), "no gap!"); static_assert(std::is_trivially_destructible_v, "this memory needs to live forever"); - inline static constinit2 GlobalEmptyString globalEmptyString; //constinit: dodge static initialization order fiasco! + inline static constinit GlobalEmptyString globalEmptyString; //constinit: dodge static initialization order fiasco! }; -- cgit