From 6d001e71595e256ba3ff8cb63d9130656b50e29e Mon Sep 17 00:00:00 2001 From: Peter Collingbourne <pcc@google.com> Date: Wed, 17 Jan 2018 20:17:53 -0800 Subject: Do not use non-standard stdext::checked_array_iterator with libc++. Bug: chromium:801780 Change-Id: Id1b0b2330d7d609bda62869bcda5bb2f6fde12bd Reviewed-on: https://chromium-review.googlesource.com/872458 Reviewed-by: Mark Mentovai <mark@chromium.org> --- src/client/windows/crash_generation/minidump_generator.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/client/windows/crash_generation/minidump_generator.cc b/src/client/windows/crash_generation/minidump_generator.cc index 100e365a..573c2786 100644 --- a/src/client/windows/crash_generation/minidump_generator.cc +++ b/src/client/windows/crash_generation/minidump_generator.cc @@ -176,7 +176,7 @@ bool HandleTraceData::CollectHandleData( stream_data->Reserved = 0; std::copy(operations_.begin(), operations_.end(), -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(_LIBCPP_STD_VER) stdext::checked_array_iterator<AVRF_HANDLE_OPERATION*>( reinterpret_cast<AVRF_HANDLE_OPERATION*>(stream_data + 1), operations_.size()) -- cgit v1.2.1