diff --git a/src/client/mac/handler/minidump_generator.cc b/src/client/mac/handler/minidump_generator.cc index f55e2ca42..47ffb82ab 100644 --- a/src/client/mac/handler/minidump_generator.cc +++ b/src/client/mac/handler/minidump_generator.cc @@ -603,8 +603,6 @@ MinidumpGenerator::WriteContextARM64(breakpad_thread_state_data_t state, MDLocationDescriptor* register_location) { TypedMDRVA context(&writer_); - arm_thread_state64_t* machine_state = - reinterpret_cast(state); if (!context.Allocate()) return false; diff --git a/src/client/windows/handler/exception_handler.h b/src/client/windows/handler/exception_handler.h index 37ee68aaa..a1035dbea 100644 --- a/src/client/windows/handler/exception_handler.h +++ b/src/client/windows/handler/exception_handler.h @@ -60,9 +60,11 @@ #include #include +#ifdef _MSC_VER #pragma warning(push) // Disable exception handler warnings. #pragma warning(disable:4530) +#endif #include #include @@ -520,6 +522,8 @@ class ExceptionHandler { } // namespace google_breakpad +#ifdef _MSC_VER #pragma warning(pop) +#endif #endif // CLIENT_WINDOWS_HANDLER_EXCEPTION_HANDLER_H__ diff --git a/src/common/string_conversion.cc b/src/common/string_conversion.cc index a4e64ff06..a241a79a5 100644 --- a/src/common/string_conversion.cc +++ b/src/common/string_conversion.cc @@ -103,7 +103,8 @@ void UTF32ToUTF16(const wchar_t* in, vector* out) { } void UTF32ToUTF16Char(wchar_t in, uint16_t out[2]) { - const UTF32* source_ptr = reinterpret_cast(&in); + const UTF32 source = in; + const UTF32* source_ptr = &source; const UTF32* source_end_ptr = source_ptr + 1; uint16_t* target_ptr = out; uint16_t* target_end_ptr = target_ptr + 2;