feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Fix build on macOS < 13 with C++20

Browse Source 
The Clang implementation of span is incomplete until
LLVM 15 / Xcode 15 / macOS 13.5

Change-Id: Iac8514fc84643cb4dae9cfaac603df5e798f9ff4
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Eike Ziller
2024-02-28 09:21:15 +01:00
parent c4e8963d8d
commit db5ac2dc15
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/utils/span.h
View File

@@ -5,7 +5,9 @@
#include <qcompilerdetection.h> #include <qcompilerdetection.h>
#if __cplusplus >= 202002L // The (Apple) Clang implementation of span is incomplete until LLVM 15 / Xcode 14.3 / macOS 13
#if __cplusplus >= 202002L \
&& !(defined(__apple_build_version__) && __apple_build_version__ < 14030022)
#include <span> #include <span>
namespace Utils { namespace Utils {
@@ -22,6 +24,11 @@ QT_WARNING_PUSH
#elif defined(Q_CC_GNU) || defined(Q_CC_CLANG) #elif defined(Q_CC_GNU) || defined(Q_CC_CLANG)
#pragma GCC system_header #pragma GCC system_header
#endif #endif
// disable automatic usage of std::span in span-lite
// since we make that decision ourselves at the top of this header
#define span_CONFIG_SELECT_SPAN span_SPAN_NONSTD
#include <3rdparty/span/span.hpp> #include <3rdparty/span/span.hpp>
namespace Utils { namespace Utils {
using namespace nonstd; using namespace nonstd;