diff options
| author | B. Stack <bgstack15@gmail.com> | 2021-06-12 16:51:25 +0000 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2021-06-12 16:51:25 +0000 |
| commit | d22ca0d17503de5733c909764cd54b586b52134f (patch) | |
| tree | b8076aea9d6e6408500ea8925ff233c2159a220b /zen/string_base.h | |
| parent | Merge branch '11.10' into 'master' (diff) | |
| parent | add upstream 11.11 (diff) | |
| download | FreeFileSync-d22ca0d17503de5733c909764cd54b586b52134f.tar.gz FreeFileSync-d22ca0d17503de5733c909764cd54b586b52134f.tar.bz2 FreeFileSync-d22ca0d17503de5733c909764cd54b586b52134f.zip | |
Merge branch '11.11' into 'master'11.11
add upstream 11.11
See merge request opensource-tracking/FreeFileSync!34
Diffstat (limited to 'zen/string_base.h')
| -rw-r--r-- | zen/string_base.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 <algorithm> #include <atomic> #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<GlobalEmptyString>, "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! }; |