diff options
| author | Sebastian Valle <subv2112@gmail.com> | 2017-09-30 08:22:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-30 08:22:14 -0500 |
| commit | 53d74215b24d4e390f380bc8aa113cdcbf377148 (patch) | |
| tree | 016f6866d15fb9a41a15666f492bed352d95b523 /src/core/hle/kernel/shared_memory.cpp | |
| parent | e2a34ccd8925a311edf4d8c04164fa0c569f2ea7 (diff) | |
| parent | da1c8d152285c5ed4b2dcb9915b886555c99610f (diff) | |
Merge pull request #2962 from huwpascoe/static_cast
Fixed type conversion ambiguity
Diffstat (limited to 'src/core/hle/kernel/shared_memory.cpp')
| -rw-r--r-- | src/core/hle/kernel/shared_memory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp index a7b66142f6..02d5a7a360 100644 --- a/src/core/hle/kernel/shared_memory.cpp +++ b/src/core/hle/kernel/shared_memory.cpp @@ -42,7 +42,8 @@ SharedPtr<SharedMemory> SharedMemory::Create(SharedPtr<Process> owner_process, u memory_region->used += size; shared_memory->linear_heap_phys_address = - Memory::FCRAM_PADDR + memory_region->base + shared_memory->backing_block_offset; + Memory::FCRAM_PADDR + memory_region->base + + static_cast<PAddr>(shared_memory->backing_block_offset); // Increase the amount of used linear heap memory for the owner process. if (shared_memory->owner_process != nullptr) { |