Merge pull request #4132 from FearlessTobi/port-966

Port #966 and #414 from yuzu (Cleanups in common and file_util) & Make bitfield assignment operator public
This commit is contained in:
Weiyi Wang 2018-09-05 18:03:36 +03:00 committed by GitHub
commit 22e172946b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 25 deletions

View file

@ -33,7 +33,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<T>(), "Argument must be a (function) pointer.");
static_assert(std::is_pointer_v<T>, "Argument must be a (function) pointer.");
size_t addr = reinterpret_cast<size_t>(f);
if (IsWithin2G(code, addr)) {
code.call(f);