diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/common/symbols.h | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/kernel.cpp | 3 | ||||
-rw-r--r-- | src/core/hle/kernel/kernel.h | 7 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/common/symbols.h b/src/common/symbols.h index e59bc5dd4..b13a8001a 100644 --- a/src/common/symbols.h +++ b/src/common/symbols.h @@ -8,8 +8,6 @@ #include "common/common.h" -class DebugInterface; - struct TSymbol { TSymbol() : 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; ObjectPool g_object_pool; ObjectPool::ObjectPool() { - memset(occupied, 0, sizeof(bool) * MAX_COUNT); next_id = INITIAL_NEXT_ID; } @@ -57,7 +56,7 @@ void ObjectPool::Clear() { delete pool[i]; occupied[i] = false; } - memset(pool, 0, sizeof(Object*)*MAX_COUNT); + pool.fill(nullptr); next_id = INITIAL_NEXT_ID; } diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 6a2e395ed..0e7e5ff68 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -4,6 +4,7 @@ #pragma once +#include <array> #include <string> #include "common/common.h" @@ -160,9 +161,9 @@ private: INITIAL_NEXT_ID = 0x10, }; - Object* pool[MAX_COUNT]; - bool occupied[MAX_COUNT]; - int next_id; + std::array<Object*, MAX_COUNT> pool; + std::array<bool, MAX_COUNT> occupied; + int next_id; }; extern ObjectPool g_object_pool; |