From 822abb7b303408413c4b84a72c855b626625213e Mon Sep 17 00:00:00 2001 From: Patrick Wuttke Date: Sun, 18 Aug 2024 09:10:26 +0200 Subject: [PATCH] Fixed some issues with compilation in CLang. --- source/mijin/debug/symbol_info.cpp | 2 +- source/mijin/types/name.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/mijin/debug/symbol_info.cpp b/source/mijin/debug/symbol_info.cpp index 86e321a..a823e7c 100644 --- a/source/mijin/debug/symbol_info.cpp +++ b/source/mijin/debug/symbol_info.cpp @@ -62,7 +62,7 @@ const char* lookupFunctionName(const void* function) #else std::string name = ""; #endif - return g_functionNameCache.insert({function, std::move(name)}).first->second.c_str(); + return g_functionNameCache.emplace(function, std::move(name)).first->second.c_str(); } #if MIJIN_COMPILER == MIJIN_COMPILER_GCC diff --git a/source/mijin/types/name.cpp b/source/mijin/types/name.cpp index 61f5e71..d475999 100644 --- a/source/mijin/types/name.cpp +++ b/source/mijin/types/name.cpp @@ -75,7 +75,7 @@ static std::size_t getOrCreateStringID(std::string_view string) { if (getLocalNames()[idx] == string) { - getLocalNameCache()[std::string(string)] = idx; + getLocalNameCache().emplace(std::string(string), idx); return idx; } } @@ -90,7 +90,7 @@ static std::size_t getOrCreateStringID(std::string_view string) { if (getLocalNames()[idx] == string) { - getLocalNameCache()[std::string(string)] = idx; + getLocalNameCache().emplace(std::string(string), idx); return idx; } } @@ -100,7 +100,7 @@ static std::size_t getOrCreateStringID(std::string_view string) const std::size_t idx = getGlobalNames().size(); getGlobalNames().emplace_back(string); copyNamesToLocal(); - getLocalNameCache()[std::string(string)] = idx; + getLocalNameCache().emplace(std::string(string), idx); return idx; }