diff options
| author |  MerryMage | 2018-01-07 22:43:41 +0000 |
|---|---|---|
| committer |  bunnei | 2018-01-08 19:20:10 -0500 |
| commit | f10a304ecdc2457124d6333862bdaaa46577fe1e (patch) | |
| tree | ed774255f32589fbecbcdc9767c6292aac531488 /src/core/memory.cpp | |
| parent | core_timing: Use 1.020GHz for core clock rate. (diff) | |
| download | yuzu-f10a304ecdc2457124d6333862bdaaa46577fe1e.tar.gz yuzu-f10a304ecdc2457124d6333862bdaaa46577fe1e.tar.xz yuzu-f10a304ecdc2457124d6333862bdaaa46577fe1e.zip | |
fix macos build
Diffstat (limited to 'src/core/memory.cpp')
| -rw-r--r-- | src/core/memory.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 93ffe9938..01ec231f6 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp | |||
| @@ -487,7 +487,7 @@ void ReadBlock(const Kernel::Process& process, const VAddr src_addr, void* dest_ | |||
| 487 | size_t page_offset = src_addr & PAGE_MASK; | 487 | size_t page_offset = src_addr & PAGE_MASK; |
| 488 | 488 | ||
| 489 | while (remaining_size > 0) { | 489 | while (remaining_size > 0) { |
| 490 | const size_t copy_amount = std::min(PAGE_SIZE - page_offset, remaining_size); | 490 | const size_t copy_amount = std::min<size_t>(PAGE_SIZE - page_offset, remaining_size); |
| 491 | const VAddr current_vaddr = static_cast<VAddr>((page_index << PAGE_BITS) + page_offset); | 491 | const VAddr current_vaddr = static_cast<VAddr>((page_index << PAGE_BITS) + page_offset); |
| 492 | 492 | ||
| 493 | switch (page_table.attributes[page_index]) { | 493 | switch (page_table.attributes[page_index]) { |
| @@ -563,7 +563,7 @@ void WriteBlock(const Kernel::Process& process, const VAddr dest_addr, const voi | |||
| 563 | size_t page_offset = dest_addr & PAGE_MASK; | 563 | size_t page_offset = dest_addr & PAGE_MASK; |
| 564 | 564 | ||
| 565 | while (remaining_size > 0) { | 565 | while (remaining_size > 0) { |
| 566 | const size_t copy_amount = std::min(PAGE_SIZE - page_offset, remaining_size); | 566 | const size_t copy_amount = std::min<size_t>(PAGE_SIZE - page_offset, remaining_size); |
| 567 | const VAddr current_vaddr = static_cast<VAddr>((page_index << PAGE_BITS) + page_offset); | 567 | const VAddr current_vaddr = static_cast<VAddr>((page_index << PAGE_BITS) + page_offset); |
| 568 | 568 | ||
| 569 | switch (page_table.attributes[page_index]) { | 569 | switch (page_table.attributes[page_index]) { |
| @@ -623,7 +623,7 @@ void ZeroBlock(const VAddr dest_addr, const size_t size) { | |||
| 623 | static const std::array<u8, PAGE_SIZE> zeros = {}; | 623 | static const std::array<u8, PAGE_SIZE> zeros = {}; |
| 624 | 624 | ||
| 625 | while (remaining_size > 0) { | 625 | while (remaining_size > 0) { |
| 626 | const size_t copy_amount = std::min(PAGE_SIZE - page_offset, remaining_size); | 626 | const size_t copy_amount = std::min<size_t>(PAGE_SIZE - page_offset, remaining_size); |
| 627 | const VAddr current_vaddr = static_cast<VAddr>((page_index << PAGE_BITS) + page_offset); | 627 | const VAddr current_vaddr = static_cast<VAddr>((page_index << PAGE_BITS) + page_offset); |
| 628 | 628 | ||
| 629 | switch (current_page_table->attributes[page_index]) { | 629 | switch (current_page_table->attributes[page_index]) { |
| @@ -674,7 +674,7 @@ void CopyBlock(VAddr dest_addr, VAddr src_addr, const size_t size) { | |||
| 674 | size_t page_offset = src_addr & PAGE_MASK; | 674 | size_t page_offset = src_addr & PAGE_MASK; |
| 675 | 675 | ||
| 676 | while (remaining_size > 0) { | 676 | while (remaining_size > 0) { |
| 677 | const size_t copy_amount = std::min(PAGE_SIZE - page_offset, remaining_size); | 677 | const size_t copy_amount = std::min<size_t>(PAGE_SIZE - page_offset, remaining_size); |
| 678 | const VAddr current_vaddr = static_cast<VAddr>((page_index << PAGE_BITS) + page_offset); | 678 | const VAddr current_vaddr = static_cast<VAddr>((page_index << PAGE_BITS) + page_offset); |
| 679 | 679 | ||
| 680 | switch (current_page_table->attributes[page_index]) { | 680 | switch (current_page_table->attributes[page_index]) { |