Fix MSVC 14.51 build of breakpad
C:/lo/online.build/workdir/UnpackedTarball/breakpad/src/client/windows/crash_generation/minidump_generator.cc(180): error C2653: 'stdext': is not a class or namespace name C:/lo/online.build/workdir/UnpackedTarball/breakpad/src/client/windows/crash_generation/minidump_generator.cc(180): error C2059: syntax error: '>' make[1]: *** [C:/lo/online/engine/solenv/gbuild/LinkTarget.mk:398: C:/lo/online.build/workdir/GenCxxObject/UnpackedTarball/breakpad/src/client/windows/crash_generation/minidump_generator.o] Error 2 As documented at https://learn.microsoft.com/en-us/cpp/porting/features-deprecated-in-visual-studio, the class checked_array_iterator is dropped in MSVC 14.51 (it was deprecated since VS 2022 17.8). Signed-off-by: Mike Kaganski <mike.kaganski@collabora.com> Change-Id: I29ad7dcf10a6ccc79e66dd21a96d80a69d8f0f99 Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/2683 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Jenkins CPCI <releng@collaboraoffice.com> (cherry picked from commit 2450d80b2790bd47c534bdf45e0e839839e9cf64) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/205370 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins
This commit is contained in:
committed by
Xisco Fauli
parent
e2af4c9f81
commit
27584318ae
@@ -36,6 +36,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,breakpad,\
|
||||
external/breakpad/SIGSTKSZ.patch \
|
||||
external/breakpad/sanitizer.patch \
|
||||
external/breakpad/include.patch \
|
||||
external/breakpad/no-checked_array_iterator.patch \
|
||||
))
|
||||
|
||||
$(eval $(call gb_UnpackedTarball_add_files,breakpad,src/tools/windows/dump_syms,\
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
--- src/client/windows/crash_generation/minidump_generator.cc
|
||||
+++ src/client/windows/crash_generation/minidump_generator.cc
|
||||
@@ -176,13 +176,7 @@
|
||||
stream_data->Reserved = 0;
|
||||
std::copy(operations_.begin(),
|
||||
operations_.end(),
|
||||
-#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())
|
||||
-#else
|
||||
reinterpret_cast<AVRF_HANDLE_OPERATION*>(stream_data + 1)
|
||||
-#endif
|
||||
);
|
||||
|
||||
return true;
|
||||
Reference in New Issue
Block a user