From eb8c26a11fbc1bd26703ca19b44c0d3da76aff00 Mon Sep 17 00:00:00 2001 From: Vinluo46 <30505327+Vinluo@users.noreply.github.com> Date: Tue, 16 Jun 2026 21:08:15 +0800 Subject: [PATCH] Refactor compiler detection conditions for array iterators --- .../3rdparty/qt/include/QtCore/qcompilerdetection.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/qrenderdoc/3rdparty/qt/include/QtCore/qcompilerdetection.h b/qrenderdoc/3rdparty/qt/include/QtCore/qcompilerdetection.h index 0b0f3c5c9..ad09be08d 100644 --- a/qrenderdoc/3rdparty/qt/include/QtCore/qcompilerdetection.h +++ b/qrenderdoc/3rdparty/qt/include/QtCore/qcompilerdetection.h @@ -105,14 +105,10 @@ # endif # define Q_DECL_EXPORT __declspec(dllexport) # define Q_DECL_IMPORT __declspec(dllimport) -# if _MSC_VER >= 1940 -# define QT_MAKE_UNCHECKED_ARRAY_ITERATOR(x) (x) -# elif _MSC_VER >= 1800 +# if _MSC_VER >= 1800 && _MSC_VER < 1940 # define QT_MAKE_UNCHECKED_ARRAY_ITERATOR(x) stdext::make_unchecked_array_iterator(x) # endif -# if _MSC_VER >= 1940 -# define QT_MAKE_CHECKED_ARRAY_ITERATOR(x, N) (x) -# elif _MSC_VER >= 1500 +# if _MSC_VER >= 1500 && _MSC_VER < 1940 # define QT_MAKE_CHECKED_ARRAY_ITERATOR(x, N) stdext::make_checked_array_iterator(x, size_t(N)) # endif /* Intel C++ disguising as Visual C++: the `using' keyword avoids warnings */