Просмотр исходного кода

Merge pull request #512 from lioncash/assignment

shared_memory: Fix assignments in SharedMemory::Map
Tony Wasserka 11 лет назад
Родитель
Сommit
73a7a379d6
2 измененных файлов с 4 добавлено и 4 удалено
  1. 3 3
      src/core/hle/kernel/shared_memory.cpp
  2. 1 1
      src/core/hle/kernel/shared_memory.h

+ 3 - 3
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;
 }

+ 1 - 1
src/core/hle/kernel/shared_memory.h

@@ -51,7 +51,7 @@ public:
     */
     ResultVal<u8*> 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)