diff options
| author |  Mai | 2023-01-27 00:07:50 +0000 |
|---|---|---|
| committer |  GitHub | 2023-01-27 00:07:50 +0000 |
| commit | e54d08fc1fa79f6c0e66f2e2ef06f21ca36cf881 (patch) | |
| tree | 6b0fd0ba833601d405256c267ccea7bad46a22a9 | |
| parent | Merge pull request #9683 from german77/high_power_joycon (diff) | |
| parent | kernel: unbreak min/max template deduction on Apple Clang (diff) | |
| download | yuzu-e54d08fc1fa79f6c0e66f2e2ef06f21ca36cf881.tar.gz yuzu-e54d08fc1fa79f6c0e66f2e2ef06f21ca36cf881.tar.xz yuzu-e54d08fc1fa79f6c0e66f2e2ef06f21ca36cf881.zip | |
Merge pull request #9685 from liamwhite/minmax
kernel: unbreak min/max template deduction on Apple Clang
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/kernel/k_page_table.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/k_page_table.cpp b/src/core/hle/kernel/k_page_table.cpp index fbd28f5f3..2e13d5d0d 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 | |||
| 2144 | const KMemoryInfo info = it->GetMemoryInfo(); | 2144 | const KMemoryInfo info = it->GetMemoryInfo(); |
| 2145 | 2145 | ||
| 2146 | // Determine the range to map. | 2146 | // Determine the range to map. |
| 2147 | KProcessAddress map_address = std::max(info.GetAddress(), start_address); | 2147 | KProcessAddress map_address = std::max<VAddr>(info.GetAddress(), start_address); |
| 2148 | const KProcessAddress map_end_address = std::min(info.GetEndAddress(), end_address); | 2148 | const KProcessAddress map_end_address = std::min<VAddr>(info.GetEndAddress(), end_address); |
| 2149 | ASSERT(map_end_address != map_address); | 2149 | ASSERT(map_end_address != map_address); |
| 2150 | 2150 | ||
| 2151 | // Determine if we should disable head merge. | 2151 | // Determine if we should disable head merge. |