From 20e594ca464a9736b990d4fc70a712b2e985632d Mon Sep 17 00:00:00 2001 From: collecting Date: Tue, 7 Oct 2025 02:35:03 +0000 Subject: [PATCH] fix: MSVC Compiler Error --- src/core/arm/dynarmic/arm_dynarmic_32.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp index b42ecccda..0409fa9e7 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp @@ -193,7 +193,11 @@ std::shared_ptr ArmDynarmic32::MakeJit(Common::PageTable* pa config.detect_misaligned_access_via_page_table = 16 | 32 | 64 | 128; config.only_detect_misalignment_via_page_table_on_page_boundary = true; - config.fastmem_pointer = reinterpret_cast(page_table->fastmem_arena); +#ifdef _MSC_VER + config.fastmem_pointer = page_table->fastmem_arena; +#else + config.fastmem_pointer = reinterpret_cast(page_table->fastmem_arena); +#endif config.fastmem_exclusive_access = config.fastmem_pointer.has_value(); config.recompile_on_exclusive_fastmem_failure = true; @@ -252,7 +256,11 @@ std::shared_ptr ArmDynarmic32::MakeJit(Common::PageTable* pa config.only_detect_misalignment_via_page_table_on_page_boundary = false; } if (!Settings::values.cpuopt_fastmem) { - config.fastmem_pointer = std::nullopt; +#ifdef _MSC_VER + config.fastmem_pointer = nullptr; +#else + config.fastmem_pointer = std::nullopt; +#endif config.fastmem_exclusive_access = false; } if (!Settings::values.cpuopt_fastmem_exclusives) {