From 199552bc1b2eba4dff9c1a3612f9b8c0e59eb6cc Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 26 Jan 2014 14:13:43 -0800 Subject: [PATCH] Small merge fix. --- Core/Debugger/Breakpoints.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/Debugger/Breakpoints.cpp b/Core/Debugger/Breakpoints.cpp index fe77fb9250..8274c93ff8 100644 --- a/Core/Debugger/Breakpoints.cpp +++ b/Core/Debugger/Breakpoints.cpp @@ -38,7 +38,7 @@ MemCheck::MemCheck() void MemCheck::Log(u32 addr, bool write, int size, u32 pc) { if (result & MEMCHECK_LOG) - NOTICE_LOG(MEMMAP, "CHK %s%i at %08x (%s), PC=%08x (%s)", write ? "Write" : "Read", size * 8, addr, symbolMap.GetDescription(addr), pc, symbolMap.GetDescription(pc)); + NOTICE_LOG(MEMMAP, "CHK %s%i at %08x (%s), PC=%08x (%s)", write ? "Write" : "Read", size * 8, addr, symbolMap.GetDescription(addr).c_str(), pc, symbolMap.GetDescription(pc).c_str()); } void MemCheck::Action(u32 addr, bool write, int size, u32 pc)