diff options
Diffstat (limited to 'src/client/windows/crash_generation/minidump_generator.cc')
| -rw-r--r-- | src/client/windows/crash_generation/minidump_generator.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/client/windows/crash_generation/minidump_generator.cc b/src/client/windows/crash_generation/minidump_generator.cc index 22e8d365..c3e91681 100644 --- a/src/client/windows/crash_generation/minidump_generator.cc +++ b/src/client/windows/crash_generation/minidump_generator.cc @@ -176,9 +176,14 @@ bool HandleTraceData::CollectHandleData( stream_data->Reserved = 0; std::copy(operations_.begin(), operations_.end(), +#ifdef _MSC_VER stdext::checked_array_iterator<AVRF_HANDLE_OPERATION*>( reinterpret_cast<AVRF_HANDLE_OPERATION*>(stream_data + 1), - operations_.size())); + operations_.size()) +#else + reinterpret_cast<AVRF_HANDLE_OPERATION*>(stream_data + 1) +#endif + ); return true; } @@ -350,7 +355,7 @@ bool MinidumpGenerator::WriteMinidump() { user_streams.UserStreamArray = user_stream_array.get(); MDRawAssertionInfo* actual_assert_info = assert_info_; - MDRawAssertionInfo client_assert_info = {0}; + MDRawAssertionInfo client_assert_info = {{0}}; if (assert_info_) { // If the assertion info object lives in the client process, |