From b3db50a3b41b2db209327387f59afa1c40532773 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 4 Aug 2020 15:42:08 +0200 Subject: Core/Misc: Fix compile errors found with msvc /permissive- --- src/common/Debugging/WheatyExceptionReport.cpp | 6 +++--- src/common/Debugging/WheatyExceptionReport.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/common/Debugging') diff --git a/src/common/Debugging/WheatyExceptionReport.cpp b/src/common/Debugging/WheatyExceptionReport.cpp index db2d050794f..c4de34bb38c 100644 --- a/src/common/Debugging/WheatyExceptionReport.cpp +++ b/src/common/Debugging/WheatyExceptionReport.cpp @@ -14,7 +14,7 @@ #pragma warning(disable:4311) #include #include -#include +#include #include #define _NO_CVCONST_H #include @@ -610,7 +610,7 @@ PEXCEPTION_POINTERS pExceptionInfo) // Given an exception code, returns a pointer to a static string with a // description of the exception //====================================================================== -LPTSTR WheatyExceptionReport::GetExceptionString(DWORD dwCode) +LPCTSTR WheatyExceptionReport::GetExceptionString(DWORD dwCode) { #define EXCEPTION(x) case EXCEPTION_##x: return _T(#x); @@ -947,7 +947,7 @@ DWORD dwTypeIndex, DWORD_PTR offset, bool & bHandled, char const* Name, -char* /*suffix*/, +char const* /*suffix*/, bool newSymbol, bool logChildren) { diff --git a/src/common/Debugging/WheatyExceptionReport.h b/src/common/Debugging/WheatyExceptionReport.h index 54cc836e7b7..a3cb4b2f04c 100644 --- a/src/common/Debugging/WheatyExceptionReport.h +++ b/src/common/Debugging/WheatyExceptionReport.h @@ -153,7 +153,7 @@ class WheatyExceptionReport static BOOL _GetProcessorName(TCHAR* sProcessorName, DWORD maxcount); // Helper functions - static LPTSTR GetExceptionString(DWORD dwCode); + static LPCTSTR GetExceptionString(DWORD dwCode); static BOOL GetLogicalAddress(PVOID addr, PTSTR szModule, DWORD len, DWORD& section, DWORD_PTR& offset); @@ -163,7 +163,7 @@ class WheatyExceptionReport static bool FormatSymbolValue(PSYMBOL_INFO, STACKFRAME64 *); - static void DumpTypeIndex(DWORD64, DWORD, DWORD_PTR, bool &, char const*, char*, bool, bool); + static void DumpTypeIndex(DWORD64, DWORD, DWORD_PTR, bool &, char const*, char const*, bool, bool); static void FormatOutputValue(char * pszCurrBuffer, BasicType basicType, DWORD64 length, PVOID pAddress, size_t bufferSize, size_t countOverride = 0); -- cgit v1.2.3