blob: 97fd63d72b20cd474b2b20a9d055c119e2194e2d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
From 97da3cf6be021886a367ce894425f842059fbdcf Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 2 Apr 2024 23:29:07 +0200
Subject: [PATCH 17/17] Fix wrong cpp conditional in qspan.h
Picked from https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-base/-/blob/main/fix-wrong-cpp-if.patch
Change-Id: I29a1fb31a43a5fc61b312d6746cf125c48dc802f
---
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 @@ public:
: 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())
--
2.44.0
|