diff options
| author | 2018-08-08 15:28:34 -0400 | |
|---|---|---|
| committer | 2018-08-08 15:28:34 -0400 | |
| commit | d224eb7c39c43754929972d07998db79ba093279 (patch) | |
| tree | 4059c27a33d3595cfc37f6316a4e29290221e3d3 /src/common/x64 | |
| parent | Merge pull request #850 from DarkLordZach/icon-meta (diff) | |
| parent | common: Convert type traits templates over to variable template versions wher... (diff) | |
| download | yuzu-d224eb7c39c43754929972d07998db79ba093279.tar.gz yuzu-d224eb7c39c43754929972d07998db79ba093279.tar.xz yuzu-d224eb7c39c43754929972d07998db79ba093279.zip | |
Merge pull request #966 from lioncash/modernize
common: Convert type traits templates over to variable template versions where applicable
Diffstat (limited to 'src/common/x64')
| -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 0f52f704b..ec76e0a47 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) { | |||
| 34 | 34 | ||
| 35 | template <typename T> | 35 | template <typename T> |
| 36 | inline void CallFarFunction(Xbyak::CodeGenerator& code, const T f) { | 36 | inline void CallFarFunction(Xbyak::CodeGenerator& code, const T f) { |
| 37 | static_assert(std::is_pointer<T>(), "Argument must be a (function) pointer."); | 37 | static_assert(std::is_pointer_v<T>, "Argument must be a (function) pointer."); |
| 38 | size_t addr = reinterpret_cast<size_t>(f); | 38 | size_t addr = reinterpret_cast<size_t>(f); |
| 39 | if (IsWithin2G(code, addr)) { | 39 | if (IsWithin2G(code, addr)) { |
| 40 | code.call(f); | 40 | code.call(f); |