diff options
author | Jens Schmer <jens.schmer+git@gmail.com> | 2018-12-10 19:42:01 +0100 |
---|---|---|
committer | Jens Schmer <jens.schmer+git@gmail.com> | 2018-12-12 17:25:56 +0100 |
commit | ae390ad5a2571cec79d4a7a7b175ac4738e6c748 (patch) | |
tree | 4197e8decd64b3974add609d6bc9983030c3ad96 /src/core/hle/kernel/shared_memory.cpp | |
parent | Merge pull request #1891 from DarkLordZach/istorage-getsize (diff) | |
download | yuzu-ae390ad5a2571cec79d4a7a7b175ac4738e6c748.tar yuzu-ae390ad5a2571cec79d4a7a7b175ac4738e6c748.tar.gz yuzu-ae390ad5a2571cec79d4a7a7b175ac4738e6c748.tar.bz2 yuzu-ae390ad5a2571cec79d4a7a7b175ac4738e6c748.tar.lz yuzu-ae390ad5a2571cec79d4a7a7b175ac4738e6c748.tar.xz yuzu-ae390ad5a2571cec79d4a7a7b175ac4738e6c748.tar.zst yuzu-ae390ad5a2571cec79d4a7a7b175ac4738e6c748.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/shared_memory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp index d1ca60125..22d0c1dd5 100644 --- a/src/core/hle/kernel/shared_memory.cpp +++ b/src/core/hle/kernel/shared_memory.cpp @@ -17,13 +17,13 @@ namespace Kernel { SharedMemory::SharedMemory(KernelCore& kernel) : Object{kernel} {} SharedMemory::~SharedMemory() = default; -SharedPtr<SharedMemory> SharedMemory::Create(KernelCore& kernel, SharedPtr<Process> owner_process, - u64 size, MemoryPermission permissions, +SharedPtr<SharedMemory> SharedMemory::Create(KernelCore& kernel, Process* owner_process, u64 size, + MemoryPermission permissions, MemoryPermission other_permissions, VAddr address, MemoryRegion region, std::string name) { SharedPtr<SharedMemory> shared_memory(new SharedMemory(kernel)); - shared_memory->owner_process = std::move(owner_process); + shared_memory->owner_process = owner_process; shared_memory->name = std::move(name); shared_memory->size = size; shared_memory->permissions = permissions; |