diff options
| author | 2018-11-19 08:56:15 -0500 | |
|---|---|---|
| committer | 2018-11-19 09:20:29 -0500 | |
| commit | 2d37ca372615e8e3e2a1feca07c1077dc4a001dd (patch) | |
| tree | b0b2909447085b26799da71fbfb6f3f586612f37 /src/core/hle/kernel | |
| parent | kernel/shared_memory: Make GetPointer() take a std::size_t instead of a u32 (diff) | |
| download | yuzu-2d37ca372615e8e3e2a1feca07c1077dc4a001dd.tar.gz yuzu-2d37ca372615e8e3e2a1feca07c1077dc4a001dd.tar.xz yuzu-2d37ca372615e8e3e2a1feca07c1077dc4a001dd.zip | |
kernel/shared_memory: Use 64-bit types for offset and size in CreateForApplet
Keeps the interface consistent with the regular Create() function.
Diffstat (limited to 'src/core/hle/kernel')
| -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 | |||
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | SharedPtr<SharedMemory> SharedMemory::CreateForApplet( | 63 | SharedPtr<SharedMemory> SharedMemory::CreateForApplet( |
| 64 | KernelCore& kernel, std::shared_ptr<std::vector<u8>> heap_block, u32 offset, u32 size, | 64 | KernelCore& kernel, std::shared_ptr<std::vector<u8>> heap_block, std::size_t offset, u64 size, |
| 65 | MemoryPermission permissions, MemoryPermission other_permissions, std::string name) { | 65 | MemoryPermission permissions, MemoryPermission other_permissions, std::string name) { |
| 66 | SharedPtr<SharedMemory> shared_memory(new SharedMemory(kernel)); | 66 | SharedPtr<SharedMemory> shared_memory(new SharedMemory(kernel)); |
| 67 | 67 | ||
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: | |||
| 64 | */ | 64 | */ |
| 65 | static SharedPtr<SharedMemory> CreateForApplet(KernelCore& kernel, | 65 | static SharedPtr<SharedMemory> CreateForApplet(KernelCore& kernel, |
| 66 | std::shared_ptr<std::vector<u8>> heap_block, | 66 | std::shared_ptr<std::vector<u8>> heap_block, |
| 67 | u32 offset, u32 size, | 67 | std::size_t offset, u64 size, |
| 68 | MemoryPermission permissions, | 68 | MemoryPermission permissions, |
| 69 | MemoryPermission other_permissions, | 69 | MemoryPermission other_permissions, |
| 70 | std::string name = "Unknown Applet"); | 70 | std::string name = "Unknown Applet"); |