32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
|
From 6810220218cbbf2854ecdedb291f7e4a84b31e54 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Albert Astals Cid <aacid@kde.org>
|
||
|
|
Date: Wed, 3 Apr 2024 00:47:01 +0200
|
||
|
|
Subject: [PATCH] Use ifdef instead of if for __cpp_lib_span
|
||
|
|
|
||
|
|
Like the other times it's used in this file
|
||
|
|
|
||
|
|
This is causing compilation errors in projects that use -Werror=undef
|
||
|
|
|
||
|
|
Fixes: QTBUG-123937
|
||
|
|
Change-Id: I0cdd2910755dc9079890011dd8dbc27a6e64793e
|
||
|
|
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
||
|
|
(cherry picked from commit 699ddcb15b5e981d32ea65d1c1a12f8fa0b06e0d)
|
||
|
|
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
||
|
|
---
|
||
|
|
src/corelib/tools/qspan.h | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/corelib/tools/qspan.h b/src/corelib/tools/qspan.h
|
||
|
|
index c9de1005a77..d6ae2570ae3 100644
|
||
|
|
--- a/src/corelib/tools/qspan.h
|
||
|
|
+++ b/src/corelib/tools/qspan.h
|
||
|
|
@@ -297,7 +297,7 @@ class QSpanBase<T, q20::dynamic_extent> : protected QSpanCommon<T>
|
||
|
|
: QSpanBase(il.begin(), il.size())
|
||
|
|
{}
|
||
|
|
|
||
|
|
-#if __cpp_lib_span
|
||
|
|
+#ifdef __cpp_lib_span
|
||
|
|
template <typename S, size_t N, if_qualification_conversion<S> = true>
|
||
|
|
Q_IMPLICIT constexpr QSpanBase(std::span<S, N> other) noexcept
|
||
|
|
: QSpanBase(other.data(), other.size())
|