summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/kernel.h
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-08-18 05:03:22 +0200
committerLioncash <mathew1800@gmail.com>2014-08-18 05:12:20 +0200
commit98fa3f7cba22997aef8ec4d121584c2488389c38 (patch)
tree40585fc835fa8fc27882923a4439d88e7ae171de /src/core/hle/kernel/kernel.h
parentMerge pull request #52 from lioncash/memory (diff)
downloadyuzu-98fa3f7cba22997aef8ec4d121584c2488389c38.tar
yuzu-98fa3f7cba22997aef8ec4d121584c2488389c38.tar.gz
yuzu-98fa3f7cba22997aef8ec4d121584c2488389c38.tar.bz2
yuzu-98fa3f7cba22997aef8ec4d121584c2488389c38.tar.lz
yuzu-98fa3f7cba22997aef8ec4d121584c2488389c38.tar.xz
yuzu-98fa3f7cba22997aef8ec4d121584c2488389c38.tar.zst
yuzu-98fa3f7cba22997aef8ec4d121584c2488389c38.zip
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 @@
#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;
/**