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/kernel.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/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() { for (int i = 0; i < MAX_COUNT; i++) { if (occupied[i]) { if (pool[i]) { - INFO_LOG(KERNEL, "KO %i: %s \"%s\"", i + HANDLE_OFFSET, pool[i]->GetTypeName(), - pool[i]->GetName()); + INFO_LOG(KERNEL, "KO %i: %s \"%s\"", i + HANDLE_OFFSET, pool[i]->GetTypeName().c_str(), + pool[i]->GetName().c_str()); } } } |