Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/client/mac/handler/minidump_generator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -603,8 +603,6 @@ MinidumpGenerator::WriteContextARM64(breakpad_thread_state_data_t state,
MDLocationDescriptor* register_location)
{
TypedMDRVA<MDRawContextARM64_Old> context(&writer_);
arm_thread_state64_t* machine_state =
reinterpret_cast<arm_thread_state64_t*>(state);

if (!context.Allocate())
return false;
Expand Down
4 changes: 4 additions & 0 deletions src/client/windows/handler/exception_handler.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,11 @@
#include <dbghelp.h>
#include <rpc.h>

#ifdef _MSC_VER
#pragma warning(push)
// Disable exception handler warnings.
#pragma warning(disable:4530)
#endif

#include <list>
#include <memory>
Expand Down Expand Up @@ -520,6 +522,8 @@ class ExceptionHandler {

} // namespace google_breakpad

#ifdef _MSC_VER
#pragma warning(pop)
#endif

#endif // CLIENT_WINDOWS_HANDLER_EXCEPTION_HANDLER_H__
3 changes: 2 additions & 1 deletion src/common/string_conversion.cc
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ void UTF32ToUTF16(const wchar_t* in, vector<uint16_t>* out) {
}

void UTF32ToUTF16Char(wchar_t in, uint16_t out[2]) {
const UTF32* source_ptr = reinterpret_cast<const UTF32*>(&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;
Expand Down
Loading