aboutsummaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/shared_memory.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-08-18 21:42:44 -0400
committerbunnei <bunneidev@gmail.com>2014-08-18 21:42:44 -0400
commite9c5c563a500ac19ecb2f580ce065a9010dedac9 (patch)
tree25155672077a81a5f1b66e738826a7b850c55e82 /src/core/hle/kernel/shared_memory.cpp
parente179dceecfd379bd0aa400f85ebb873a43e63ee1 (diff)
parent98fa3f7cba22997aef8ec4d121584c2488389c38 (diff)
Merge pull request #55 from lioncash/string
Core: Alter the kernel string functions to use std::string instead of const char*.
Diffstat (limited to 'src/core/hle/kernel/shared_memory.cpp')
-rw-r--r--src/core/hle/kernel/shared_memory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp
index 52823048f..2a6a483a1 100644
--- a/src/core/hle/kernel/shared_memory.cpp
+++ b/src/core/hle/kernel/shared_memory.cpp
@@ -11,7 +11,7 @@ namespace Kernel {
class SharedMemory : public Object {
public:
- const char* GetTypeName() const { return "SharedMemory"; }
+ std::string GetTypeName() const { return "SharedMemory"; }
static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::SharedMemory; }
Kernel::HandleType GetHandleType() const { return Kernel::HandleType::SharedMemory; }