diff options
| author | bunnei <bunneidev@gmail.com> | 2014-08-18 21:42:44 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-08-18 21:42:44 -0400 |
| commit | e9c5c563a500ac19ecb2f580ce065a9010dedac9 (patch) | |
| tree | 25155672077a81a5f1b66e738826a7b850c55e82 /src/core/hle/kernel/archive.cpp | |
| parent | e179dceecfd379bd0aa400f85ebb873a43e63ee1 (diff) | |
| parent | 98fa3f7cba22997aef8ec4d121584c2488389c38 (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/archive.cpp')
| -rw-r--r-- | src/core/hle/kernel/archive.cpp | 6 |
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 { class Archive : public Object { public: - const char* GetTypeName() const { return "Archive"; } - const char* GetName() const { return name.c_str(); } + std::string GetTypeName() const { return "Archive"; } + std::string GetName() const { return name; } static Kernel::HandleType GetStaticHandleType() { return HandleType::Archive; } Kernel::HandleType GetHandleType() const { return HandleType::Archive; } @@ -110,7 +110,7 @@ Result MountArchive(Archive* archive) { return -1; } g_archive_map[id_code] = archive->GetHandle(); - INFO_LOG(KERNEL, "Mounted archive %s", archive->GetName()); + INFO_LOG(KERNEL, "Mounted archive %s", archive->GetName().c_str()); return 0; } |
