diff options
| author | bunnei <bunneidev@gmail.com> | 2018-09-17 09:51:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-17 09:51:47 -0400 |
| commit | 076add4ccddff3940e20fc320615e3d330f77119 (patch) | |
| tree | bacabcfed8665974c276489509a1caa330ad36a2 /src/common/x64/xbyak_util.h | |
| parent | 3be048e50a2090caf1eeeb2373c7524ecc177ce8 (diff) | |
| parent | 63c2e32e207d31ecadd9022e1d7cd705c9febac8 (diff) | |
Merge pull request #1326 from FearlessTobi/port-4182
Port #4182 from Citra: "Prefix all size_t with std::"
Diffstat (limited to 'src/common/x64/xbyak_util.h')
| -rw-r--r-- | src/common/x64/xbyak_util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/x64/xbyak_util.h b/src/common/x64/xbyak_util.h index 02323a017..5cc8a8c76 100644 --- a/src/common/x64/xbyak_util.h +++ b/src/common/x64/xbyak_util.h @@ -34,7 +34,7 @@ inline bool IsWithin2G(const Xbyak::CodeGenerator& code, uintptr_t target) { template <typename T> inline void CallFarFunction(Xbyak::CodeGenerator& code, const T f) { static_assert(std::is_pointer_v<T>, "Argument must be a (function) pointer."); - size_t addr = reinterpret_cast<size_t>(f); + std::size_t addr = reinterpret_cast<std::size_t>(f); if (IsWithin2G(code, addr)) { code.call(f); } else { |