diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-01-31 12:11:54 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-04-09 20:03:25 +0200 |
| commit | c6cdf38e752c22babdbe645366bdfb7ce51d01ff (patch) | |
| tree | 450b02523cb5a16791674ad1d06fb68c72eac971 /src/corelib/tools/qvarlengtharray.h | |
| parent | 775945137b6ef62de9a7d416b1fe59d79006ba82 (diff) | |
Change qHash() to work with size_t instead of uint
This is required, so that QHash and QSet can hold more
than 2^32 items on 64 bit platforms.
The actual hashing functions for strings are still 32bit, this will
be changed in a follow-up commit.
Change-Id: I4372125252486075ff3a0b45ecfa818359fe103b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/corelib/tools/qvarlengtharray.h')
| -rw-r--r-- | src/corelib/tools/qvarlengtharray.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qvarlengtharray.h b/src/corelib/tools/qvarlengtharray.h index a0de6bf2a11..cf5e2ee8c71 100644 --- a/src/corelib/tools/qvarlengtharray.h +++ b/src/corelib/tools/qvarlengtharray.h @@ -611,7 +611,7 @@ inline bool operator>=(const QVarLengthArray<T, Prealloc1> &lhs, const QVarLengt } template <typename T, qsizetype Prealloc> -uint qHash(const QVarLengthArray<T, Prealloc> &key, uint seed = 0) +size_t qHash(const QVarLengthArray<T, Prealloc> &key, size_t seed = 0) noexcept(noexcept(qHashRange(key.cbegin(), key.cend(), seed))) { return qHashRange(key.cbegin(), key.cend(), seed); |