summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/tools
diff options
context:
space:
mode:
authorFabian Kosmale <fabian.kosmale@qt.io>2021-03-29 14:13:46 +0200
committerFabian Kosmale <fabian.kosmale@qt.io>2021-04-06 11:35:35 +0200
commit595b4e1a9b436a8190964dc41f79621400f5a6be (patch)
tree6e2c79a7f9ac4a74710024aa287408da95aab6e3 /tests/auto/corelib/tools
parent0eb0fc87014b8de06473055bd2298b2423d480f6 (diff)
QList: Satisfy contiguous_range requirements
With C++20, there is a new iterator_category: contiguous_iterator, for containers whose elements are stored contiguously in memory. In Qt 6, QList satisfies this requirement. However, we still need to tell the standard machinery about it. Step one is to mark the iterators as contiguous_iterator; as that exists only in C++20, we have to ifdef accordingly. We also have to ensure that the iterators satisfy pointer_traits by defining element_type due to how contiguous_range is specified. As this runs afoul of LWG 3346, we check for known bad _GLIBCXX_RELEASE versions. Change-Id: I8c134544e694ba937e4d912393eb72fa75b49e3d Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'tests/auto/corelib/tools')
-rw-r--r--tests/auto/corelib/tools/qlist/tst_qlist.cpp20
1 files changed, 20 insertions, 0 deletions
diff --git a/tests/auto/corelib/tools/qlist/tst_qlist.cpp b/tests/auto/corelib/tools/qlist/tst_qlist.cpp
index 96a1a35968..d6ff25b830 100644
--- a/tests/auto/corelib/tools/qlist/tst_qlist.cpp
+++ b/tests/auto/corelib/tools/qlist/tst_qlist.cpp
@@ -33,6 +33,26 @@
#include <QScopedValueRollback>
#include <qlist.h>
+
+#if __cplusplus >= 202002L && (!defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE >= 11)
+# if __has_include(<concepts>)
+# include <concepts>
+# if defined(__cpp_concepts)
+ static_assert(std::contiguous_iterator<QList<int>::iterator>);
+ static_assert(std::contiguous_iterator<QList<int>::const_iterator>);
+# endif
+# endif
+# if __has_include(<ranges>)
+# include <ranges>
+# if defined(__cpp_lib_ranges)
+ namespace rns = std::ranges;
+
+ static_assert(rns::contiguous_range<QList<int>>);
+ static_assert(rns::contiguous_range<const QList<int>>);
+# endif
+# endif
+#endif
+
struct Movable {
Movable(char input = 'j')
: i(input)