diff options
Diffstat (limited to 'src/core/hle/kernel/kernel.h')
| -rw-r--r-- | src/core/hle/kernel/kernel.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index d9afcdd25..0e7e5ff68 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -4,6 +4,8 @@ #pragma once +#include <array> +#include <string> #include "common/common.h" typedef u32 Handle; @@ -33,7 +35,6 @@ enum class HandleType : u32 { }; enum { - MAX_NAME_LENGTH = 0x100, DEFAULT_STACK_SIZE = 0x4000, }; @@ -45,8 +46,8 @@ class Object : NonCopyable { public: virtual ~Object() {} Handle GetHandle() const { return handle; } - virtual const char* GetTypeName() const { return "[BAD KERNEL OBJECT TYPE]"; } - virtual const char* GetName() const { return "[UNKNOWN KERNEL OBJECT]"; } + virtual std::string GetTypeName() const { return "[BAD KERNEL OBJECT TYPE]"; } + virtual std::string GetName() const { return "[UNKNOWN KERNEL OBJECT]"; } virtual Kernel::HandleType GetHandleType() const = 0; /** @@ -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; |