From 68c659d6b13650be3e86c8aec82eb43461db09d6 Mon Sep 17 00:00:00 2001 From: Ben Adams Date: Sat, 15 Dec 2018 08:57:07 +0000 Subject: [PATCH] Fix warning causing error in warning as error (dotnet/coreclr#21557) c:\github\coreclr\src\vm\excep.cpp(4489): error C2220: warning treated as error - no 'object' file generated [C:\GitHub\coreclr\bin\obj\Windows_NT.x64.Release\src\vm\wks\cee_wks.vcxproj] c:\github\coreclr\src\vm\excep.cpp(4489): warning C4800: 'BOOL': forcing value to bool 'true' or 'false' (performance warning) [C:\GitHub\coreclr\bin\obj\Windows_NT.x64.Release\src\vm\wks\cee_wks.vcxproj] Commit migrated from https://github.com/dotnet/coreclr/commit/a41039e66e8f36acd739c3935f9690b21303746f --- src/coreclr/src/vm/excep.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/coreclr/src/vm/excep.cpp b/src/coreclr/src/vm/excep.cpp index 75e962c..34adc32 100644 --- a/src/coreclr/src/vm/excep.cpp +++ b/src/coreclr/src/vm/excep.cpp @@ -4467,9 +4467,9 @@ void DECLSPEC_NORETURN RaiseDeadLockException() // Returns: // true If the exception is of a type that is always swallowed. // -bool ExceptionIsAlwaysSwallowed(EXCEPTION_POINTERS *pExceptionInfo) +BOOL ExceptionIsAlwaysSwallowed(EXCEPTION_POINTERS *pExceptionInfo) { - bool isSwallowed = false; + BOOL isSwallowed = false; // The exception code must be ours, if it is one of our Exceptions. if (IsComPlusException(pExceptionInfo->ExceptionRecord)) -- 2.7.4