diff options
| author | bunnei <bunneidev@gmail.com> | 2014-08-19 03:42:44 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-08-19 03:42:44 +0200 |
| commit | e9c5c563a500ac19ecb2f580ce065a9010dedac9 (patch) | |
| tree | 25155672077a81a5f1b66e738826a7b850c55e82 /src/core/hle/kernel/kernel.h | |
| parent | Merge pull request #45 from bunnei/master (diff) | |
| parent | Core: Alter the kernel string functions to use std::string instead of const char*. (diff) | |
| download | yuzu-e9c5c563a500ac19ecb2f580ce065a9010dedac9.tar yuzu-e9c5c563a500ac19ecb2f580ce065a9010dedac9.tar.gz yuzu-e9c5c563a500ac19ecb2f580ce065a9010dedac9.tar.bz2 yuzu-e9c5c563a500ac19ecb2f580ce065a9010dedac9.tar.lz yuzu-e9c5c563a500ac19ecb2f580ce065a9010dedac9.tar.xz yuzu-e9c5c563a500ac19ecb2f580ce065a9010dedac9.tar.zst yuzu-e9c5c563a500ac19ecb2f580ce065a9010dedac9.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/kernel/kernel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index d9afcdd25..6a2e395ed 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -4,6 +4,7 @@ #pragma once +#include <string> #include "common/common.h" typedef u32 Handle; @@ -33,7 +34,6 @@ enum class HandleType : u32 { }; enum { - MAX_NAME_LENGTH = 0x100, DEFAULT_STACK_SIZE = 0x4000, }; @@ -45,8 +45,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; /** |