unified-agent - fix static initialization order problem

unified-agent - fix static initialization order problem

1 files changed, 8 insertions, 5 deletions

diff --git a/library/cpp/unified_agent_client/enum.h b/library/cpp/unified_agent_client/enum.h
index b21e21acb0..ad08efb723 100644
--- a/library/cpp/unified_agent_client/enum.h
+++ b/library/cpp/unified_agent_client/enum.h
@@ -8,23 +8,26 @@ namespace NUnifiedAgent {
         using TEnumNames = TVector<const TString*>;
 
         template <typename TEnum>
-        TEnumNames BuildEnumNames() {
+        TEnumNames* BuildEnumNames() {
             const auto names = GetEnumNames<TEnum>();
-            auto result = TEnumNames(names.size());
+            TEnumNames* result = new TEnumNames(names.size());
             size_t index = 0;
             for (const auto& p: names) {
                 Y_VERIFY(static_cast<size_t>(p.first) == index);
-                result[index++] = &p.second;
+                (*result)[index++] = &p.second;
             }
             return result;
         }
 
         template <typename TEnum>
-        inline const auto EnumNames = BuildEnumNames<TEnum>();
+        const TEnumNames& EnumNamesVec() {
+            static const TEnumNames* EnumNames = BuildEnumNames<TEnum>();
+            return *EnumNames;
+        }
     }
 
     template <typename TEnum, typename = std::enable_if_t<std::is_enum_v<TEnum>>>
     inline const TString& NameOf(TEnum val) noexcept {
-        return *NPrivate::EnumNames<TEnum>[static_cast<size_t>(val)];
+        return *NPrivate::EnumNamesVec<TEnum>()[static_cast<size_t>(val)];
     }
 }