summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/archive.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/archive.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/archive.cpp')
-rw-r--r--src/core/hle/kernel/archive.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/archive.cpp b/src/core/hle/kernel/archive.cpp
index 76b2520da..5079fcb84 100644
--- a/src/core/hle/kernel/archive.cpp
+++ b/src/core/hle/kernel/archive.cpp
@@ -31,8 +31,8 @@ enum class FileCommand : u32 {
31 31
32class Archive : public Object { 32class Archive : public Object {
33public: 33public:
34 const char* GetTypeName() const { return "Archive"; } 34 std::string GetTypeName() const { return "Archive"; }
35 const char* GetName() const { return name.c_str(); } 35 std::string GetName() const { return name; }
36 36
37 static Kernel::HandleType GetStaticHandleType() { return HandleType::Archive; } 37 static Kernel::HandleType GetStaticHandleType() { return HandleType::Archive; }
38 Kernel::HandleType GetHandleType() const { return HandleType::Archive; } 38 Kernel::HandleType GetHandleType() const { return HandleType::Archive; }
@@ -110,7 +110,7 @@ Result MountArchive(Archive* archive) {
110 return -1; 110 return -1;
111 } 111 }
112 g_archive_map[id_code] = archive->GetHandle(); 112 g_archive_map[id_code] = archive->GetHandle();
113 INFO_LOG(KERNEL, "Mounted archive %s", archive->GetName()); 113 INFO_LOG(KERNEL, "Mounted archive %s", archive->GetName().c_str());
114 return 0; 114 return 0;
115} 115}
116 116