From e82bef425fdbb1583a0c51a424457a773bab97c3 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Tue, 15 Dec 2020 20:10:16 +0300 Subject: [PATCH] vm: fix warnings and add narrow cast for u64 ptrs --- rpcs3/Emu/Memory/vm.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rpcs3/Emu/Memory/vm.h b/rpcs3/Emu/Memory/vm.h index cd4ebcac37..2c999e673b 100644 --- a/rpcs3/Emu/Memory/vm.h +++ b/rpcs3/Emu/Memory/vm.h @@ -175,10 +175,10 @@ namespace vm struct cast_impl { static vm::addr_t cast(u32 addr, - u32 line, - u32 col, - const char* file, - const char* func) + u32, + u32, + const char*, + const char*) { return static_cast(addr); } @@ -193,7 +193,7 @@ namespace vm const char* file, const char* func) { - return static_cast(static_cast(addr)); + return static_cast(::narrow(addr, line, col, file, func)); } };