Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

kernel: unbreak min/max template deduction on Apple Clang

Liam86c6735bd0af
diff --git a/src/core/hle/kernel/k_page_table.cpp b/src/core/hle/kernel/k_page_table.cpp
index fbd28f5f37..2e13d5d0df 100644
--- a/src/core/hle/kernel/k_page_table.cpp
+++ b/src/core/hle/kernel/k_page_table.cpp
@@ -2144,8 +2144,8 @@ void KPageTable::RemapPageGroup(PageLinkedList* page_list, KProcessAddress addre
const KMemoryInfo info = it->GetMemoryInfo();
// Determine the range to map.
- KProcessAddress map_address = std::max(info.GetAddress(), start_address);
- const KProcessAddress map_end_address = std::min(info.GetEndAddress(), end_address);
+ KProcessAddress map_address = std::max<VAddr>(info.GetAddress(), start_address);
+ const KProcessAddress map_end_address = std::min<VAddr>(info.GetEndAddress(), end_address);
ASSERT(map_end_address != map_address);
// Determine if we should disable head merge.