diff options
| author |  bunnei | 2014-08-18 21:42:44 -0400 |
|---|---|---|
| committer | bunnei | 2014-08-18 21:42:44 -0400 |
| commit | e9c5c563a500ac19ecb2f580ce065a9010dedac9 (patch) | |
| tree | 25155672077a81a5f1b66e738826a7b850c55e82 /src/core/hle/kernel/kernel.cpp | |
| parent | Merge pull request #45 from bunnei/master (diff) | |
| parent | Core: Alter the kernel string functions to use std::string instead of const c... (diff) | |
| download | yuzu-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/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 7d9bd261e..96bc63a53 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -71,8 +71,8 @@ void ObjectPool::List() { | |||
| 71 | for (int i = 0; i < MAX_COUNT; i++) { | 71 | for (int i = 0; i < MAX_COUNT; i++) { |
| 72 | if (occupied[i]) { | 72 | if (occupied[i]) { |
| 73 | if (pool[i]) { | 73 | if (pool[i]) { |
| 74 | INFO_LOG(KERNEL, "KO %i: %s \"%s\"", i + HANDLE_OFFSET, pool[i]->GetTypeName(), | 74 | INFO_LOG(KERNEL, "KO %i: %s \"%s\"", i + HANDLE_OFFSET, pool[i]->GetTypeName().c_str(), |
| 75 | pool[i]->GetName()); | 75 | pool[i]->GetName().c_str()); |
| 76 | } | 76 | } |
| 77 | } | 77 | } |
| 78 | } | 78 | } |