diff options
author | N00byKing <N00byKing@hotmail.de> | 2018-03-19 17:27:04 +0100 |
---|---|---|
committer | N00byKing <N00byKing@hotmail.de> | 2018-03-19 17:27:04 +0100 |
commit | 0e72d0d82622deb503f05fd0b76790b8ab147404 (patch) | |
tree | c525f52c003a5a0770e2049dc8c665a9970c3cb2 /src | |
parent | Clean Warnings (?) (diff) | |
download | yuzu-0e72d0d82622deb503f05fd0b76790b8ab147404.tar yuzu-0e72d0d82622deb503f05fd0b76790b8ab147404.tar.gz yuzu-0e72d0d82622deb503f05fd0b76790b8ab147404.tar.bz2 yuzu-0e72d0d82622deb503f05fd0b76790b8ab147404.tar.lz yuzu-0e72d0d82622deb503f05fd0b76790b8ab147404.tar.xz yuzu-0e72d0d82622deb503f05fd0b76790b8ab147404.tar.zst yuzu-0e72d0d82622deb503f05fd0b76790b8ab147404.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/core/core.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/shared_memory.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/svc.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index eeba4e2da..5a80d03dc 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -99,7 +99,7 @@ System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& file ResultStatus init_result{Init(emu_window, system_mode.first.get())}; if (init_result != ResultStatus::Success) { - LOG_CRITICAL(Core, "Failed to initialize system (Error %i)!", init_result); + LOG_CRITICAL(Core, "Failed to initialize system (Error %i)!", static_cast<int>(init_result)); System::Shutdown(); return init_result; } diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp index 1875dd8d0..c8bda8494 100644 --- a/src/core/hle/kernel/shared_memory.cpp +++ b/src/core/hle/kernel/shared_memory.cpp @@ -126,7 +126,7 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi if (address != 0) { // TODO(shinyquagsire23): Check for virtual/mappable memory here too? if (address >= Memory::HEAP_VADDR && address < Memory::HEAP_VADDR_END) { - LOG_ERROR(Kernel, "cannot map id=%u, address=0x%llx name=%s, invalid address", + LOG_ERROR(Kernel, "cannot map id=%u, address=0x%lx name=%s, invalid address", GetObjectId(), address, name.c_str()); return ERR_INVALID_ADDRESS; } diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 062bcf29e..311ab4187 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -39,7 +39,7 @@ static ResultCode SetHeapSize(VAddr* heap_addr, u64 heap_size) { } static ResultCode SetMemoryAttribute(VAddr addr, u64 size, u32 state0, u32 state1) { - LOG_WARNING(Kernel_SVC, "(STUBBED) called, addr=0x%llx", addr); + LOG_WARNING(Kernel_SVC, "(STUBBED) called, addr=0x%lx", addr); return RESULT_SUCCESS; } |