summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/kernel.h
diff options
context:
space:
mode:
authorGravatar Lioncash2014-08-17 23:03:22 -0400
committerGravatar Lioncash2014-08-17 23:12:20 -0400
commit98fa3f7cba22997aef8ec4d121584c2488389c38 (patch)
tree40585fc835fa8fc27882923a4439d88e7ae171de /src/core/hle/kernel/kernel.h
parentMerge pull request #52 from lioncash/memory (diff)
downloadyuzu-98fa3f7cba22997aef8ec4d121584c2488389c38.tar.gz
yuzu-98fa3f7cba22997aef8ec4d121584c2488389c38.tar.xz
yuzu-98fa3f7cba22997aef8ec4d121584c2488389c38.zip
Core: Alter the kernel string functions to use std::string instead of const char*.
Most functions already operate on std::strings. This also removes the need to manually null terminate thread names.
Diffstat (limited to 'src/core/hle/kernel/kernel.h')
-rw-r--r--src/core/hle/kernel/kernel.h6
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 @@
4 4
5#pragma once 5#pragma once
6 6
7#include <string>
7#include "common/common.h" 8#include "common/common.h"
8 9
9typedef u32 Handle; 10typedef u32 Handle;
@@ -33,7 +34,6 @@ enum class HandleType : u32 {
33}; 34};
34 35
35enum { 36enum {
36 MAX_NAME_LENGTH = 0x100,
37 DEFAULT_STACK_SIZE = 0x4000, 37 DEFAULT_STACK_SIZE = 0x4000,
38}; 38};
39 39
@@ -45,8 +45,8 @@ class Object : NonCopyable {
45public: 45public:
46 virtual ~Object() {} 46 virtual ~Object() {}
47 Handle GetHandle() const { return handle; } 47 Handle GetHandle() const { return handle; }
48 virtual const char* GetTypeName() const { return "[BAD KERNEL OBJECT TYPE]"; } 48 virtual std::string GetTypeName() const { return "[BAD KERNEL OBJECT TYPE]"; }
49 virtual const char* GetName() const { return "[UNKNOWN KERNEL OBJECT]"; } 49 virtual std::string GetName() const { return "[UNKNOWN KERNEL OBJECT]"; }
50 virtual Kernel::HandleType GetHandleType() const = 0; 50 virtual Kernel::HandleType GetHandleType() const = 0;
51 51
52 /** 52 /**