From b5ad1fcd084d1fa8fe3d0869e119b12d7556857b Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 30 Jul 2012 15:25:25 +0200 Subject: Fix compilation: Move qHash(const T &t, uint seed) up. It needs to be visible from qHash(const QPair &key, uint seed). Change-Id: Ibb63ce6da1e655bfb841c5e580e184ef66c5b766 Reviewed-by: Thiago Macieira Reviewed-by: Friedemann Kleint --- src/corelib/tools/qhash.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h index 0c322cddcf..80ed456ace 100644 --- a/src/corelib/tools/qhash.h +++ b/src/corelib/tools/qhash.h @@ -103,6 +103,8 @@ template inline uint qHash(const T *key, uint seed = 0) #pragma warning( pop ) #endif +template inline uint qHash(const T &t, uint seed) { return (qHash(t) ^ seed); } + template inline uint qHash(const QPair &key, uint seed = 0) { uint h1 = qHash(key.first, seed); @@ -110,8 +112,6 @@ template inline uint qHash(const QPair &key, return ((h1 << 16) | (h1 >> 16)) ^ h2 ^ seed; } -template inline uint qHash(const T &t, uint seed) { return (qHash(t) ^ seed); } - struct Q_CORE_EXPORT QHashData { struct Node { -- cgit v1.2.3