diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2012-04-11 00:40:36 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-13 17:05:02 +0200 |
| commit | bcedd0e2427ccd213553d976e28f7d1a8f3b0ceb (patch) | |
| tree | a0a63808900657ce9aeb18d9d3693128cb1143a3 /src/corelib/tools | |
| parent | 1424702918720576792da713cd3b8fee485775cf (diff) | |
QSharedPointer: qHash two arguments support
Change-Id: I800de3fd9769e4829018360c25a8cf2ee2e2e08b
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qsharedpointer_impl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index c656e54513..0688f94421 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -60,6 +60,7 @@ QT_END_HEADER #include <new> #include <QtCore/qatomic.h> #include <QtCore/qobject.h> // for qobject_cast +#include <QtCore/qhash.h> // for qHash QT_BEGIN_HEADER @@ -771,11 +772,10 @@ Q_INLINE_TEMPLATE bool operator<(T *ptr1, const QSharedPointer<X> &ptr2) // // qHash // -template <class T> inline uint qHash(const T *key); // defined in qhash.h template <class T> -Q_INLINE_TEMPLATE uint qHash(const QSharedPointer<T> &ptr) +Q_INLINE_TEMPLATE uint qHash(const QSharedPointer<T> &ptr, uint seed = 0) { - return QT_PREPEND_NAMESPACE(qHash)<T>(ptr.data()); + return QT_PREPEND_NAMESPACE(qHash)(ptr.data(), seed); } |