From 54287bbfbb7c09627202f24a2958882ffb068ed7 Mon Sep 17 00:00:00 2001 From: Joachim Schoeberl Date: Tue, 9 Jan 2024 10:21:06 +0100 Subject: [PATCH] wrap static variable into function --- libsrc/core/archive.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/libsrc/core/archive.cpp b/libsrc/core/archive.cpp index d394c49c..c4731562 100644 --- a/libsrc/core/archive.cpp +++ b/libsrc/core/archive.cpp @@ -10,24 +10,31 @@ namespace ngcore { // clang-tidy should ignore this static object - static std::map type_register; // NOLINT + // static std::map type_register; // NOLINT + + auto& GetTypeRegister() + { + static std::map type_register; + return type_register; + } + const detail::ClassArchiveInfo& Archive :: GetArchiveRegister(const std::string& classname) { // if(type_register == nullptr) type_register = // std::make_unique>(); - return (type_register)[classname]; + return GetTypeRegister()[classname]; } void Archive :: SetArchiveRegister(const std::string& classname, const detail::ClassArchiveInfo& info) { // if(type_register == nullptr) type_register = // std::make_unique>(); - (type_register)[classname] = info; + GetTypeRegister()[classname] = info; } bool Archive :: IsRegistered(const std::string& classname) { // if(type_register == nullptr) type_register = // std::make_unique>(); - return type_register.count(classname) != 0; + return GetTypeRegister().count(classname) != 0; } #ifdef NETGEN_PYTHON