From 96c174aed4d22fffb32b49afaa7558cc1852323c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 30 Jan 2015 11:37:53 -0500 Subject: shared_memory: Fix assignments in SharedMemory::Map --- src/core/hle/kernel/shared_memory.cpp | 6 +++--- src/core/hle/kernel/shared_memory.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp index 536d134b..eff68d48 100644 --- a/src/core/hle/kernel/shared_memory.cpp +++ b/src/core/hle/kernel/shared_memory.cpp @@ -30,9 +30,9 @@ ResultCode SharedMemory::Map(VAddr address, MemoryPermission permissions, ErrorSummary::InvalidArgument, ErrorLevel::Permanent); } - base_address = address; - permissions = permissions; - other_permissions = other_permissions; + this->base_address = address; + this->permissions = permissions; + this->other_permissions = other_permissions; return RESULT_SUCCESS; } diff --git a/src/core/hle/kernel/shared_memory.h b/src/core/hle/kernel/shared_memory.h index f9ae23e9..d393e817 100644 --- a/src/core/hle/kernel/shared_memory.h +++ b/src/core/hle/kernel/shared_memory.h @@ -51,7 +51,7 @@ public: */ ResultVal GetPointer(u32 offset = 0); - VAddr base_address; ///< Address of shared memory block in RAM + VAddr base_address; ///< Address of shared memory block in RAM MemoryPermission permissions; ///< Permissions of shared memory block (SVC field) MemoryPermission other_permissions; ///< Other permissions of shared memory block (SVC field) std::string name; ///< Name of shared memory object (optional) -- cgit v1.2.3