summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2021-11-16 11:28:57 +0100
committerMarc Mutz <marc.mutz@qt.io>2021-11-20 01:38:41 +0000
commit229f356cefaaacc75c2414048ac4c70db3de4927 (patch)
treebcee5bf93b6d1a10fcdb6f32de4153ff72e121fe /tests/auto
parent2fbe460245f88ea5929e4cadd1bfdf43dacce224 (diff)
Short live q20::ssize()!
Extract the definition of q20::ssize() from tst_qanystringview.cpp, where it had to be placed for its backport to 6.2. Change-Id: I3f758c98a4b1efd453f4fc044b8d3f1a89de62d1 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/corelib/text/qanystringview/tst_qanystringview.cpp14
1 files changed, 1 insertions, 13 deletions
diff --git a/tests/auto/corelib/text/qanystringview/tst_qanystringview.cpp b/tests/auto/corelib/text/qanystringview/tst_qanystringview.cpp
index e5e3ac9f84..73dc02b082 100644
--- a/tests/auto/corelib/text/qanystringview/tst_qanystringview.cpp
+++ b/tests/auto/corelib/text/qanystringview/tst_qanystringview.cpp
@@ -41,6 +41,7 @@
#include <vector>
#include <algorithm>
#include <memory>
+#include <q20iterator.h>
// for negative testing (can't convert from)
#include <deque>
@@ -530,19 +531,6 @@ void tst_QAnyStringView::fromContainers() const
fromContainer<Char, std::vector<Char>>();
}
-namespace q20 {
-#ifdef __cpp_lib_ssize
- using std::ssize;
-#else
- template<class C> constexpr auto ssize(const C& c)
- -> std::common_type_t<std::ptrdiff_t, std::make_signed_t<decltype(c.size())>>
- { return static_cast<std::common_type_t<ptrdiff_t, std::make_signed_t<decltype(c.size())>>>(c.size()); }
-
- template<class T, ptrdiff_t N> constexpr ptrdiff_t ssize(const T (&array)[N]) noexcept
- { return N; }
-#endif
-}
-
namespace help {
template <typename T>
auto ssize(T &t) { return q20::ssize(t); }