diff options
author | James Rowe <jroweboy@gmail.com> | 2018-07-02 18:20:50 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2018-07-03 03:45:47 +0200 |
commit | 0d46f0df122dbc9b9a9d9f97e2da6b1953ef939b (patch) | |
tree | aba03bf491181cf741420dd1445bd5399e48a3af /src/core/hle/kernel/shared_memory.cpp | |
parent | Rename logging macro back to LOG_* (diff) | |
download | yuzu-0d46f0df122dbc9b9a9d9f97e2da6b1953ef939b.tar yuzu-0d46f0df122dbc9b9a9d9f97e2da6b1953ef939b.tar.gz yuzu-0d46f0df122dbc9b9a9d9f97e2da6b1953ef939b.tar.bz2 yuzu-0d46f0df122dbc9b9a9d9f97e2da6b1953ef939b.tar.lz yuzu-0d46f0df122dbc9b9a9d9f97e2da6b1953ef939b.tar.xz yuzu-0d46f0df122dbc9b9a9d9f97e2da6b1953ef939b.tar.zst yuzu-0d46f0df122dbc9b9a9d9f97e2da6b1953ef939b.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/shared_memory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp index 80fa81abd..93f7f2772 100644 --- a/src/core/hle/kernel/shared_memory.cpp +++ b/src/core/hle/kernel/shared_memory.cpp @@ -108,7 +108,7 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi // Error out if the requested permissions don't match what the creator process allows. if (static_cast<u32>(permissions) & ~static_cast<u32>(own_other_permissions)) { LOG_ERROR(Kernel, "cannot map id={}, address=0x{:X} name={}, permissions don't match", - GetObjectId(), address, name); + GetObjectId(), address, name); return ERR_INVALID_COMBINATION; } @@ -116,7 +116,7 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi if (other_permissions != MemoryPermission::DontCare && static_cast<u32>(this->permissions) & ~static_cast<u32>(other_permissions)) { LOG_ERROR(Kernel, "cannot map id={}, address=0x{:X} name={}, permissions don't match", - GetObjectId(), address, name); + GetObjectId(), address, name); return ERR_WRONG_PERMISSION; } |