diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-09-05 08:59:23 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-09-05 18:29:11 +0200 |
| commit | 8932eee9a652d8a325410b147955c9939278f9ed (patch) | |
| tree | fda60b0e79074b7736c71858531631ccc4442f80 /src/corelib/tools | |
| parent | 8aae49019d7386c1abd6cd32f7ccb68c264c0288 (diff) | |
QOffsetStringArray: fix size_t/qsizetype mismatch
The sizeof operator returns, and both minifyValue and makeStaticString
accept, size_t. Don't funnel it through a qsizetype variable, then,
but maintain it as a size_t all the way.
Pick-to: 6.4 6.3 6.2
Task-number: QTBUG-103533
Change-Id: I05c6a6c5da3d02daabbf1d25a15531c6f44a80ce
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qoffsetstringarray_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h index f86316430a..93360a3925 100644 --- a/src/corelib/tools/qoffsetstringarray_p.h +++ b/src/corelib/tools/qoffsetstringarray_p.h @@ -128,7 +128,7 @@ template <typename StringExtractor, typename... T> constexpr auto makeOffsetStringArray(StringExtractor extractString, const T &... entries) { constexpr size_t Count = sizeof...(T); - constexpr qsizetype StringLength = (sizeof(extractString(T{})) + ...); + constexpr size_t StringLength = (sizeof(extractString(T{})) + ...); using MinifiedOffsetType = decltype(QtPrivate::minifyValue<StringLength>()); size_t offset = 0; |