From bd5cc690bca0c798952b14b989ad1bf8e8f00011 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 31 Oct 2018 17:56:38 -0700 Subject: Clean up string literal implicit const casting and some two-phase lookup nits on Windows (#20730) * Remove implicit c-string const casting and clean up some C++ standards conformance bugs. * Fix const string conversion in FCSigCheck. --- src/utilcode/debug.cpp | 2 +- src/utilcode/winfix.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/utilcode') diff --git a/src/utilcode/debug.cpp b/src/utilcode/debug.cpp index a19e7a4f63..943d7a3db6 100644 --- a/src/utilcode/debug.cpp +++ b/src/utilcode/debug.cpp @@ -284,7 +284,7 @@ BOOL LaunchJITDebugger() STARTUPINFO StartupInfo; memset(&StartupInfo, 0, sizeof(StartupInfo)); StartupInfo.cb = sizeof(StartupInfo); - StartupInfo.lpDesktop = W("Winsta0\\Default"); + StartupInfo.lpDesktop = const_cast(W("Winsta0\\Default")); PROCESS_INFORMATION ProcessInformation; if (WszCreateProcess(NULL, cmdLine, NULL, NULL, TRUE, 0, NULL, NULL, &StartupInfo, &ProcessInformation)) diff --git a/src/utilcode/winfix.cpp b/src/utilcode/winfix.cpp index bea212d9fa..ea1813054f 100644 --- a/src/utilcode/winfix.cpp +++ b/src/utilcode/winfix.cpp @@ -52,7 +52,7 @@ static BOOL gWinWrapperContractRecursionBreak = FALSE; class WinWrapperContract { public: - WinWrapperContract(char *szFunction, char *szFile, int lineNum) + WinWrapperContract(const char *szFunction, const char *szFile, int lineNum) { CANNOT_HAVE_CONTRACT; -- cgit v1.2.3