diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-11-19 14:56:15 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-11-19 15:20:29 +0100 |
| commit | 2d37ca372615e8e3e2a1feca07c1077dc4a001dd (patch) | |
| tree | b0b2909447085b26799da71fbfb6f3f586612f37 /src/core | |
| parent | kernel/shared_memory: Make GetPointer() take a std::size_t instead of a u32 (diff) | |
| download | yuzu-2d37ca372615e8e3e2a1feca07c1077dc4a001dd.tar yuzu-2d37ca372615e8e3e2a1feca07c1077dc4a001dd.tar.gz yuzu-2d37ca372615e8e3e2a1feca07c1077dc4a001dd.tar.bz2 yuzu-2d37ca372615e8e3e2a1feca07c1077dc4a001dd.tar.lz yuzu-2d37ca372615e8e3e2a1feca07c1077dc4a001dd.tar.xz yuzu-2d37ca372615e8e3e2a1feca07c1077dc4a001dd.tar.zst yuzu-2d37ca372615e8e3e2a1feca07c1077dc4a001dd.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/kernel/shared_memory.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/shared_memory.h | 2 |
2 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 214f0c9bf..68ad39fa1 100644 --- a/src/core/hle/kernel/shared_memory.cpp +++ b/src/core/hle/kernel/shared_memory.cpp @@ -61,7 +61,7 @@ SharedPtr<SharedMemory> SharedMemory::Create(KernelCore& kernel, SharedPtr<Proce } SharedPtr<SharedMemory> SharedMemory::CreateForApplet( - KernelCore& kernel, std::shared_ptr<std::vector<u8>> heap_block, u32 offset, u32 size, + KernelCore& kernel, std::shared_ptr<std::vector<u8>> heap_block, std::size_t offset, u64 size, MemoryPermission permissions, MemoryPermission other_permissions, std::string name) { SharedPtr<SharedMemory> shared_memory(new SharedMemory(kernel)); diff --git a/src/core/hle/kernel/shared_memory.h b/src/core/hle/kernel/shared_memory.h index 7d7d6486d..60433f09b 100644 --- a/src/core/hle/kernel/shared_memory.h +++ b/src/core/hle/kernel/shared_memory.h @@ -64,7 +64,7 @@ public: */ static SharedPtr<SharedMemory> CreateForApplet(KernelCore& kernel, std::shared_ptr<std::vector<u8>> heap_block, - u32 offset, u32 size, + std::size_t offset, u64 size, MemoryPermission permissions, MemoryPermission other_permissions, std::string name = "Unknown Applet"); |