diff options
| author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2021-01-15 04:48:58 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-15 04:48:58 -0300 |
| commit | 5b9aedfc215e2f7227a8604d2d28fb462949d537 (patch) | |
| tree | ed1f105b1fef3fc9a5209c5106accaaee283ebf2 /src/core/hle/kernel/memory | |
| parent | c8bf0caca0a3b923edcf199824903c9576c6df5c (diff) | |
| parent | 8620de6b2030bef35360d029354f672cde8978f1 (diff) | |
Merge pull request #5356 from lioncash/clz
common/bit_util: Replace CLZ/CTZ operations with standardized ones
Diffstat (limited to 'src/core/hle/kernel/memory')
| -rw-r--r-- | src/core/hle/kernel/memory/page_heap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/memory/page_heap.h b/src/core/hle/kernel/memory/page_heap.h index 22b0de860..131093284 100644 --- a/src/core/hle/kernel/memory/page_heap.h +++ b/src/core/hle/kernel/memory/page_heap.h @@ -8,11 +8,11 @@ #pragma once #include <array> +#include <bit> #include <vector> #include "common/alignment.h" #include "common/assert.h" -#include "common/bit_util.h" #include "common/common_funcs.h" #include "common/common_types.h" #include "core/hle/kernel/memory/memory_types.h" @@ -105,7 +105,7 @@ private: ASSERT(depth == 0); return -1; } - offset = offset * 64 + Common::CountTrailingZeroes64(v); + offset = offset * 64 + static_cast<u32>(std::countr_zero(v)); ++depth; } while (depth < static_cast<s32>(used_depths)); |