diff options
Diffstat (limited to 'src/corelib/tools/qoffsetstringarray_p.h')
-rw-r--r-- | src/corelib/tools/qoffsetstringarray_p.h | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h index a3b56badc6..461d61a2ba 100644 --- a/src/corelib/tools/qoffsetstringarray_p.h +++ b/src/corelib/tools/qoffsetstringarray_p.h @@ -20,6 +20,7 @@ #include <QByteArrayView> +#include <QtCore/q20algorithm.h> #include <array> #include <limits> #include <string_view> @@ -69,21 +70,13 @@ private: }; namespace QtPrivate { -// std::copy is not constexpr in C++17 -template <typename II, typename OO> -static constexpr OO copyData(II input, qsizetype n, OO output) -{ - using E = decltype(+*output); - for (qsizetype i = 0; i < n; ++i) - output[i] = E(input[i]); - return output + n; -} - template <size_t Highest> constexpr auto minifyValue() { - if constexpr (Highest <= (std::numeric_limits<quint8>::max)()) { + constexpr size_t max8 = (std::numeric_limits<quint8>::max)(); + constexpr size_t max16 = (std::numeric_limits<quint16>::max)(); + if constexpr (Highest <= max8) { return quint8(Highest); - } else if constexpr (Highest <= (std::numeric_limits<quint16>::max)()) { + } else if constexpr (Highest <= max16) { return quint16(Highest); } else { // int is probably enough for everyone @@ -100,7 +93,7 @@ constexpr auto makeStaticString(Extractor extract, const T &... entries) const char *strings[] = { extract(entries).operator const char *()... }; size_t lengths[] = { sizeof(extract(T{}))... }; for (size_t i = 0; i < std::size(strings); ++i) { - copyData(strings[i], lengths[i], result.begin() + offset); + q20::copy_n(strings[i], lengths[i], result.begin() + offset); offset += lengths[i]; } return result; @@ -110,7 +103,7 @@ template <size_t N> struct StaticString { char value[N] = {}; constexpr StaticString() = default; - constexpr StaticString(const char (&s)[N]) { copyData(s, N, value); } + constexpr StaticString(const char (&s)[N]) { q20::copy_n(s, N, value); } constexpr operator const char *() const { return value; } }; @@ -136,7 +129,9 @@ constexpr auto qOffsetStringArray(StringExtractor extractString, const T &... en // prepend zero std::array<MinifiedOffsetType, Count + 1> minifiedOffsetList = {}; - QtPrivate::copyData(fullOffsetList.begin(), Count, minifiedOffsetList.begin() + 1); + q20::transform(fullOffsetList.begin(), fullOffsetList.end(), + minifiedOffsetList.begin() + 1, + [] (auto e) { return MinifiedOffsetType(e); }); std::array staticString = QtPrivate::makeStaticString<StringLength>(extractString, entries...); return QOffsetStringArray(staticString, minifiedOffsetList); |