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/dbus | |
| 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/dbus')
| -rw-r--r-- | src/dbus/qdbusextratypes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h index 6bb12ffe49..d172d51294 100644 --- a/src/dbus/qdbusextratypes.h +++ b/src/dbus/qdbusextratypes.h @@ -105,7 +105,7 @@ inline bool operator!=(const QDBusObjectPath &lhs, const QDBusObjectPath &rhs) inline bool operator<(const QDBusObjectPath &lhs, const QDBusObjectPath &rhs) { return lhs.path() < rhs.path(); } -inline uint qHash(const QDBusObjectPath &objectPath, uint seed = 0) +inline size_t qHash(const QDBusObjectPath &objectPath, size_t seed = 0) { return qHash(objectPath.path(), seed); } @@ -158,7 +158,7 @@ inline bool operator!=(const QDBusSignature &lhs, const QDBusSignature &rhs) inline bool operator<(const QDBusSignature &lhs, const QDBusSignature &rhs) { return lhs.signature() < rhs.signature(); } -inline uint qHash(const QDBusSignature &signature, uint seed = 0) +inline size_t qHash(const QDBusSignature &signature, size_t seed = 0) { return qHash(signature.signature(), seed); } class QDBusVariant |