diff options
author | Chloe <25727384+ogniK5377@users.noreply.github.com> | 2021-02-13 00:43:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-13 00:43:01 +0100 |
commit | 37939482fb93d2155d8625596f2b1145d4f6e8e3 (patch) | |
tree | 0c18a00c0f9be5cc87b50ff46c439765d9f7db46 /src/core/hle/kernel/memory/memory_manager.cpp | |
parent | Merge pull request #5902 from lioncash/core-warn (diff) | |
download | yuzu-37939482fb93d2155d8625596f2b1145d4f6e8e3.tar yuzu-37939482fb93d2155d8625596f2b1145d4f6e8e3.tar.gz yuzu-37939482fb93d2155d8625596f2b1145d4f6e8e3.tar.bz2 yuzu-37939482fb93d2155d8625596f2b1145d4f6e8e3.tar.lz yuzu-37939482fb93d2155d8625596f2b1145d4f6e8e3.tar.xz yuzu-37939482fb93d2155d8625596f2b1145d4f6e8e3.tar.zst yuzu-37939482fb93d2155d8625596f2b1145d4f6e8e3.zip |
Diffstat (limited to 'src/core/hle/kernel/memory/memory_manager.cpp')
-rw-r--r-- | src/core/hle/kernel/memory/memory_manager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/memory/memory_manager.cpp b/src/core/hle/kernel/memory/memory_manager.cpp index acf13585c..77f135cdc 100644 --- a/src/core/hle/kernel/memory/memory_manager.cpp +++ b/src/core/hle/kernel/memory/memory_manager.cpp @@ -8,9 +8,9 @@ #include "common/assert.h" #include "common/common_types.h" #include "common/scope_exit.h" -#include "core/hle/kernel/errors.h" #include "core/hle/kernel/memory/memory_manager.h" #include "core/hle/kernel/memory/page_linked_list.h" +#include "core/hle/kernel/svc_results.h" namespace Kernel::Memory { @@ -95,7 +95,7 @@ ResultCode MemoryManager::Allocate(PageLinkedList& page_list, std::size_t num_pa // Choose a heap based on our page size request const s32 heap_index{PageHeap::GetBlockIndex(num_pages)}; if (heap_index < 0) { - return ERR_OUT_OF_MEMORY; + return ResultOutOfMemory; } // TODO (bunnei): Support multiple managers @@ -140,7 +140,7 @@ ResultCode MemoryManager::Allocate(PageLinkedList& page_list, std::size_t num_pa // Only succeed if we allocated as many pages as we wanted if (num_pages) { - return ERR_OUT_OF_MEMORY; + return ResultOutOfMemory; } // We succeeded! |