Explorar el Código

Merge pull request #9685 from liamwhite/minmax

kernel: unbreak min/max template deduction on Apple Clang
Mai hace 3 años
padre
commit
e54d08fc1f
Se han modificado 1 ficheros con 2 adiciones y 2 borrados
  1. 2 2
      src/core/hle/kernel/k_page_table.cpp

+ 2 - 2
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.