diff options
author | Mai M <mathew1800@gmail.com> | 2021-11-02 18:41:57 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-02 18:41:57 -0400 |
commit | 3d1f2bb3aa2e5bced4ab2342b5e591224f09f0ba (patch) | |
tree | 5cbd9a62e1daf1c1de97444858064fe8210df077 /src/core/hle/kernel | |
parent | b118fa8698dbe0e2b6e663c1c37a7eac03422905 (diff) | |
parent | cb09ea0f0174162a85f47fdb8446b397c3c57e20 (diff) |
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) { current_heap_addr = heap_region_start + size; } - return MakeResult<VAddr>(heap_region_start); + return heap_region_start; } 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, block_manager->Update(addr, needed_num_pages, state, perm); - return MakeResult<VAddr>(addr); + return addr; } ResultCode KPageTable::LockForDeviceAddressSpace(VAddr addr, std::size_t size) { |