diff options
author | Lioncash <mathew1800@gmail.com> | 2014-08-18 05:03:22 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2014-08-18 05:12:20 +0200 |
commit | 98fa3f7cba22997aef8ec4d121584c2488389c38 (patch) | |
tree | 40585fc835fa8fc27882923a4439d88e7ae171de /src/core/hle/kernel/address_arbiter.cpp | |
parent | Merge pull request #52 from lioncash/memory (diff) | |
download | yuzu-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/address_arbiter.cpp')
-rw-r--r-- | src/core/hle/kernel/address_arbiter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp index bdf76e0c2..174d4cd6e 100644 --- a/src/core/hle/kernel/address_arbiter.cpp +++ b/src/core/hle/kernel/address_arbiter.cpp @@ -17,8 +17,8 @@ namespace Kernel { class AddressArbiter : public Object { public: - const char* GetTypeName() const { return "Arbiter"; } - const char* GetName() const { return name.c_str(); } + std::string GetTypeName() const { return "Arbiter"; } + std::string GetName() const { return name; } static Kernel::HandleType GetStaticHandleType() { return HandleType::AddressArbiter; } Kernel::HandleType GetHandleType() const { return HandleType::AddressArbiter; } |