summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2020-06-25 22:53:13 -0400
committerGravatar GitHub2020-06-25 22:53:13 -0400
commitc4fe83a7bc302acbefe0eedee48eabc671d33964 (patch)
tree4bca5b0aa7a8deb34f407e9657e3eb017bcdf8e5 /src
parentMerge pull request #4151 from ReinUsesLisp/gl-invalidations (diff)
parentmemory_manager: Remove useless assertion (diff)
downloadyuzu-c4fe83a7bc302acbefe0eedee48eabc671d33964.tar.gz
yuzu-c4fe83a7bc302acbefe0eedee48eabc671d33964.tar.xz
yuzu-c4fe83a7bc302acbefe0eedee48eabc671d33964.zip
Merge pull request #4159 from ogniK5377/mem-manager-dumb-assert
memory_manager: Remove useless assertion
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/memory/memory_manager.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/core/hle/kernel/memory/memory_manager.cpp b/src/core/hle/kernel/memory/memory_manager.cpp
index 616148190..acf13585c 100644
--- a/src/core/hle/kernel/memory/memory_manager.cpp
+++ b/src/core/hle/kernel/memory/memory_manager.cpp
@@ -139,7 +139,6 @@ ResultCode MemoryManager::Allocate(PageLinkedList& page_list, std::size_t num_pa
139 } 139 }
140 140
141 // Only succeed if we allocated as many pages as we wanted 141 // Only succeed if we allocated as many pages as we wanted
142 ASSERT(num_pages >= 0);
143 if (num_pages) { 142 if (num_pages) {
144 return ERR_OUT_OF_MEMORY; 143 return ERR_OUT_OF_MEMORY;
145 } 144 }