summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/kernel.cpp
diff options
context:
space:
mode:
authorGravatar Lioncash2014-08-19 00:20:56 -0400
committerGravatar Lioncash2014-08-19 00:32:48 -0400
commitab4648d3ca38c68579a72b2260dfbea81e26730f (patch)
treeacc964ea1b91fb2c13baf8244b006bb98deabc1c /src/core/hle/kernel/kernel.cpp
parentMerge pull request #55 from lioncash/string (diff)
downloadyuzu-ab4648d3ca38c68579a72b2260dfbea81e26730f.tar.gz
yuzu-ab4648d3ca38c68579a72b2260dfbea81e26730f.tar.xz
yuzu-ab4648d3ca38c68579a72b2260dfbea81e26730f.zip
Core: Use std::array for managing kernel object space
These avoid relying on memset for clearing the arrays.
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
-rw-r--r--src/core/hle/kernel/kernel.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 96bc63a53..a4a258875 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -17,7 +17,6 @@ Handle g_main_thread = 0;
17ObjectPool g_object_pool; 17ObjectPool g_object_pool;
18 18
19ObjectPool::ObjectPool() { 19ObjectPool::ObjectPool() {
20 memset(occupied, 0, sizeof(bool) * MAX_COUNT);
21 next_id = INITIAL_NEXT_ID; 20 next_id = INITIAL_NEXT_ID;
22} 21}
23 22
@@ -57,7 +56,7 @@ void ObjectPool::Clear() {
57 delete pool[i]; 56 delete pool[i];
58 occupied[i] = false; 57 occupied[i] = false;
59 } 58 }
60 memset(pool, 0, sizeof(Object*)*MAX_COUNT); 59 pool.fill(nullptr);
61 next_id = INITIAL_NEXT_ID; 60 next_id = INITIAL_NEXT_ID;
62} 61}
63 62