diff options
author | 2025-03-17 05:17:57 +1100 | |
---|---|---|
committer | 2025-03-17 05:17:57 +1100 | |
commit | 5f6296049ba89aa8dbb33e3162f1cd0c3b3b42b8 (patch) | |
tree | 4bc13859e71704b510fc41c7ae55bc5a9d05e054 /src/lib/util/mfpresolve.h | |
parent | d7d7a4c46c14ae4aa06a289c49f351aeb234d6dc (diff) |
Miscellaneous minor stuff:
* scripts/minimaws: Set option strict for JavaScript code.
* util/mfpresolve.h: Be explicit about turning nullptr into a pointer to
data.
* cpu/drcbearm64.cpp: Reduced number of temporary registers used for AND
with some operand combinations.
Diffstat (limited to 'src/lib/util/mfpresolve.h')
-rw-r--r-- | src/lib/util/mfpresolve.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/util/mfpresolve.h b/src/lib/util/mfpresolve.h index 3c67cd543ff..eb3fba2b85d 100644 --- a/src/lib/util/mfpresolve.h +++ b/src/lib/util/mfpresolve.h @@ -75,7 +75,9 @@ inline std::pair<std::uintptr_t, std::uintptr_t> resolve_member_function(Ret (T: } else { - return std::make_pair(std::uintptr_t(static_cast<void (*)()>(nullptr)), std::uintptr_t(nullptr)); + return std::make_pair( + std::uintptr_t(static_cast<void (*)()>(nullptr)), + std::uintptr_t(static_cast<void *>(nullptr))); } } @@ -96,7 +98,9 @@ inline std::pair<std::uintptr_t, std::uintptr_t> resolve_member_function(Ret (T: } else { - return std::make_pair(std::uintptr_t(static_cast<void (*)()>(nullptr)), std::uintptr_t(nullptr)); + return std::make_pair( + std::uintptr_t(static_cast<void (*)()>(nullptr)), + std::uintptr_t(static_cast<void *>(nullptr))); } } |