diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-07-18 18:40:35 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-07-18 19:37:19 -0400 |
| commit | 93cba6f6994e3410f8ef82bc53bb1448ee57aece (patch) | |
| tree | 7d9ebe8daf8da9a1ec0316b43b26a84321eba7a1 | |
| parent | 3d1e8f750cb7ca4f06a04ed4b1dca61d11b94197 (diff) | |
vm_manager: Add missing commas to string literal array elements in GetMemoryStateName()
Without these, this would perform concatenation, which is definitely not
what we want here.
| -rw-r--r-- | src/core/hle/kernel/vm_manager.cpp | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp index 034dd490e..10b3ebaca 100644 --- a/src/core/hle/kernel/vm_manager.cpp +++ b/src/core/hle/kernel/vm_manager.cpp @@ -16,30 +16,20 @@ namespace Kernel { static const char* GetMemoryStateName(MemoryState state) { - static const char* names[] = { - "Unmapped", - "Io", - "Normal", - "CodeStatic", - "CodeMutable", - "Heap", - "Shared", - "Unknown1" - "ModuleCodeStatic", - "ModuleCodeMutable", - "IpcBuffer0", - "Mapped", - "ThreadLocal", - "TransferMemoryIsolated", - "TransferMemory", - "ProcessMemory", - "Unknown2" - "IpcBuffer1", - "IpcBuffer3", - "KernelStack", + static constexpr const char* names[] = { + "Unmapped", "Io", + "Normal", "CodeStatic", + "CodeMutable", "Heap", + "Shared", "Unknown1", + "ModuleCodeStatic", "ModuleCodeMutable", + "IpcBuffer0", "Mapped", + "ThreadLocal", "TransferMemoryIsolated", + "TransferMemory", "ProcessMemory", + "Unknown2", "IpcBuffer1", + "IpcBuffer3", "KernelStack", }; - return names[(int)state]; + return names[static_cast<int>(state)]; } bool VirtualMemoryArea::CanBeMergedWith(const VirtualMemoryArea& next) const { |