aboutsummaryrefslogtreecommitdiff
path: root/src/common/Debugging
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2020-08-04 15:42:08 +0200
committerShauren <shauren.trinity@gmail.com>2022-01-26 14:20:13 +0100
commit58d199db480358aa88a427245f4f4716447fa3f3 (patch)
tree04523c18a458013ee79b2ee40320b130814b6db7 /src/common/Debugging
parente2fb15fd225e772a43cac3e5df19fd94d3557997 (diff)
Core/Misc: Fix compile errors found with msvc /permissive-
(cherry picked from commit b3db50a3b41b2db209327387f59afa1c40532773)
Diffstat (limited to 'src/common/Debugging')
-rw-r--r--src/common/Debugging/WheatyExceptionReport.cpp6
-rw-r--r--src/common/Debugging/WheatyExceptionReport.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/common/Debugging/WheatyExceptionReport.cpp b/src/common/Debugging/WheatyExceptionReport.cpp
index 28f3cf57ded..a5a23d7eb7d 100644
--- a/src/common/Debugging/WheatyExceptionReport.cpp
+++ b/src/common/Debugging/WheatyExceptionReport.cpp
@@ -14,7 +14,7 @@
#pragma warning(disable:4311)
#include <windows.h>
#include <tlhelp32.h>
-#include <stdio.h>
+#include <cstdio>
#include <tchar.h>
#define _NO_CVCONST_H
#include <dbghelp.h>
@@ -613,7 +613,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);
@@ -950,7 +950,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);