diff options
| author | 2021-11-02 18:41:57 -0400 | |
|---|---|---|
| committer | 2021-11-02 18:41:57 -0400 | |
| commit | 3d1f2bb3aa2e5bced4ab2342b5e591224f09f0ba (patch) | |
| tree | 5cbd9a62e1daf1c1de97444858064fe8210df077 /src/core/hle/kernel | |
| parent | Merge pull request #7227 from vonchenplus/fix_memory_leak_v2 (diff) | |
| parent | general: Remove MakeResult helpers (diff) | |
| download | yuzu-3d1f2bb3aa2e5bced4ab2342b5e591224f09f0ba.tar.gz yuzu-3d1f2bb3aa2e5bced4ab2342b5e591224f09f0ba.tar.xz yuzu-3d1f2bb3aa2e5bced4ab2342b5e591224f09f0ba.zip | |
Merge pull request #7268 from Morph1984/expected-resultval
common, result: Implement a subset of std::expected and use it in ResultVal
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/k_page_table.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/k_page_table.cpp b/src/core/hle/kernel/k_page_table.cpp index 5e0b620c2..526b87241 100644 --- a/src/core/hle/kernel/k_page_table.cpp +++ b/src/core/hle/kernel/k_page_table.cpp | |||
| @@ -859,7 +859,7 @@ ResultVal<VAddr> KPageTable::SetHeapSize(std::size_t size) { | |||
| 859 | current_heap_addr = heap_region_start + size; | 859 | current_heap_addr = heap_region_start + size; |
| 860 | } | 860 | } |
| 861 | 861 | ||
| 862 | return MakeResult<VAddr>(heap_region_start); | 862 | return heap_region_start; |
| 863 | } | 863 | } |
| 864 | 864 | ||
| 865 | ResultVal<VAddr> KPageTable::AllocateAndMapMemory(std::size_t needed_num_pages, std::size_t align, | 865 | ResultVal<VAddr> KPageTable::AllocateAndMapMemory(std::size_t needed_num_pages, std::size_t align, |
| @@ -893,7 +893,7 @@ ResultVal<VAddr> KPageTable::AllocateAndMapMemory(std::size_t needed_num_pages, | |||
| 893 | 893 | ||
| 894 | block_manager->Update(addr, needed_num_pages, state, perm); | 894 | block_manager->Update(addr, needed_num_pages, state, perm); |
| 895 | 895 | ||
| 896 | return MakeResult<VAddr>(addr); | 896 | return addr; |
| 897 | } | 897 | } |
| 898 | 898 | ||
| 899 | ResultCode KPageTable::LockForDeviceAddressSpace(VAddr addr, std::size_t size) { | 899 | ResultCode KPageTable::LockForDeviceAddressSpace(VAddr addr, std::size_t size) { |