summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/mutex.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2014-08-18 21:42:44 -0400
committerGravatar bunnei2014-08-18 21:42:44 -0400
commite9c5c563a500ac19ecb2f580ce065a9010dedac9 (patch)
tree25155672077a81a5f1b66e738826a7b850c55e82 /src/core/hle/kernel/mutex.cpp
parentMerge pull request #45 from bunnei/master (diff)
parentCore: Alter the kernel string functions to use std::string instead of const c... (diff)
downloadyuzu-e9c5c563a500ac19ecb2f580ce065a9010dedac9.tar.gz
yuzu-e9c5c563a500ac19ecb2f580ce065a9010dedac9.tar.xz
yuzu-e9c5c563a500ac19ecb2f580ce065a9010dedac9.zip
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/mutex.cpp')
-rw-r--r--src/core/hle/kernel/mutex.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp
index 055f503f9..5d7d65dd9 100644
--- a/src/core/hle/kernel/mutex.cpp
+++ b/src/core/hle/kernel/mutex.cpp
@@ -15,8 +15,8 @@ namespace Kernel {
15 15
16class Mutex : public Object { 16class Mutex : public Object {
17public: 17public:
18 const char* GetTypeName() const { return "Mutex"; } 18 std::string GetTypeName() const { return "Mutex"; }
19 const char* GetName() const { return name.c_str(); } 19 std::string GetName() const { return name; }
20 20
21 static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Mutex; } 21 static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Mutex; }
22 Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Mutex; } 22 Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Mutex; }