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/qversionnumber.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/qversionnumber.h')
| -rw-r--r-- | src/corelib/tools/qversionnumber.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qversionnumber.h b/src/corelib/tools/qversionnumber.h index f31cdc92a6..c5756bdfb0 100644 --- a/src/corelib/tools/qversionnumber.h +++ b/src/corelib/tools/qversionnumber.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE class QVersionNumber; -Q_CORE_EXPORT uint qHash(const QVersionNumber &key, uint seed = 0); +Q_CORE_EXPORT size_t qHash(const QVersionNumber &key, size_t seed = 0); #ifndef QT_NO_DATASTREAM Q_CORE_EXPORT QDataStream& operator<<(QDataStream &out, const QVersionNumber &version); @@ -283,7 +283,7 @@ private: #ifndef QT_NO_DATASTREAM friend Q_CORE_EXPORT QDataStream& operator>>(QDataStream &in, QVersionNumber &version); #endif - friend Q_CORE_EXPORT uint qHash(const QVersionNumber &key, uint seed); + friend Q_CORE_EXPORT size_t qHash(const QVersionNumber &key, size_t seed); }; Q_DECLARE_TYPEINFO(QVersionNumber, Q_MOVABLE_TYPE); |