From f00d4a9dc0fd77292ff5e093e4c787d8d1f626ee Mon Sep 17 00:00:00 2001 From: Maschell Date: Tue, 17 Mar 2026 20:27:21 +0100 Subject: [PATCH] Fix using memory mapping module allocator if possible --- wumsloader/src/module/ModuleManagement.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wumsloader/src/module/ModuleManagement.cpp b/wumsloader/src/module/ModuleManagement.cpp index b969bed..124e05f 100644 --- a/wumsloader/src/module/ModuleManagement.cpp +++ b/wumsloader/src/module/ModuleManagement.cpp @@ -277,7 +277,7 @@ std::vector ModuleManagement::loadAndLinkModules(const std::str if (auto linkInfo = ModuleLinkInformationFactory::loadAndLink(std::span(file.data(), file.size()), defaultAllocator, error)) { moduleContainers.emplace_back(std::move(metaInfo), std::move(*linkInfo)); } else { - auto errMsg = string_format("Failed to load/link module %s. %s", metaInfo.getExportName().c_str(), ModuleLinkErrorsToString(error)); + auto errMsg = string_format("Failed to load/link module %s. %s", metaInfo.getExportName().c_str(), ModuleLinkErrorsToString(error).data()); DEBUG_FUNCTION_LINE_ERR("%s", errMsg.c_str()); OSFatal(errMsg.c_str()); } @@ -308,10 +308,10 @@ std::vector ModuleManagement::loadAndLinkModules(const std::str for (auto &[metaInfo, file] : regularModuleMetaInfoWithLoadedFiles) { ModuleLinkErrors error = ModuleLinkErrors::MODULE_LINK_ERROR_NONE; - if (auto linkInfo = ModuleLinkInformationFactory::loadAndLink(std::span(file.data(), file.size()), defaultAllocator, error)) { + if (auto linkInfo = ModuleLinkInformationFactory::loadAndLink(std::span(file.data(), file.size()), *mappedAllocatorOpt, error)) { moduleContainers.emplace_back(std::move(metaInfo), std::move(*linkInfo)); } else { - auto errMsg = string_format("Failed to load/link module %s. %s", metaInfo.getExportName().c_str(), ModuleLinkErrorsToString(error)); + auto errMsg = string_format("Failed to load/link module %s. %s", metaInfo.getExportName().c_str(), ModuleLinkErrorsToString(error).data()); DEBUG_FUNCTION_LINE_ERR("%s", errMsg.c_str()); OSFatal(errMsg.c_str()); }