diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-11-29 12:33:41 -0500 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-29 12:33:41 -0500 | 
| commit | 91ad6b7098e06948ea386f883ae816ad2cb809be (patch) | |
| tree | 92e56b888615d2c100c612ca2c235305b2e8b141 | |
| parent | df49795bcbb4fa7e161c860c40ef36dce65d7a8d (diff) | |
| parent | 7c1cb5e8c9e88f7d339698d729ec4a00a79ae2f8 (diff) | |
Merge pull request #12194 from liamwhite/fruit-company
video_core: fix mac compile
| -rw-r--r-- | src/video_core/buffer_cache/usage_tracker.h | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/src/video_core/buffer_cache/usage_tracker.h b/src/video_core/buffer_cache/usage_tracker.h index ab05fe415..5f8688d31 100644 --- a/src/video_core/buffer_cache/usage_tracker.h +++ b/src/video_core/buffer_cache/usage_tracker.h @@ -58,7 +58,7 @@ private:      void TrackPage(u64 page, u64 offset, u64 size) noexcept {          const size_t offset_in_page = offset % PAGE_BYTES;          const size_t first_bit = offset_in_page >> BYTES_PER_BIT_SHIFT; -        const size_t num_bits = std::min(size, PAGE_BYTES) >> BYTES_PER_BIT_SHIFT; +        const size_t num_bits = std::min<size_t>(size, PAGE_BYTES) >> BYTES_PER_BIT_SHIFT;          const size_t mask = ~u64{0} >> (64 - num_bits);          pages[page] |= (~u64{0} & mask) << first_bit;      } @@ -66,7 +66,7 @@ private:      bool IsPageUsed(u64 page, u64 offset, u64 size) const noexcept {          const size_t offset_in_page = offset % PAGE_BYTES;          const size_t first_bit = offset_in_page >> BYTES_PER_BIT_SHIFT; -        const size_t num_bits = std::min(size, PAGE_BYTES) >> BYTES_PER_BIT_SHIFT; +        const size_t num_bits = std::min<size_t>(size, PAGE_BYTES) >> BYTES_PER_BIT_SHIFT;          const size_t mask = ~u64{0} >> (64 - num_bits);          const size_t mask2 = (~u64{0} & mask) << first_bit;          return (pages[page] & mask2) != 0; | 
