diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-03-05 13:07:23 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-04-15 13:03:03 +0200 |
| commit | e75f3e6bd2d30cc7237493b77d078831c63c9d3e (patch) | |
| tree | 22f249ff9d278824e375dea84b8bc59d369fc488 /src/qml/qml/ftw/qhashedstring.cpp | |
| parent | 2cd8a90bd4d171ed2404822b6046455a94d4b6ed (diff) | |
Fix compilation with v4vm's v8 compatibility headers
Some code is also commented out - it will disappear during the removal of the
v8 code later.
Change-Id: I46e07be47ed7d4bc12423a6348d674d2fca489f7
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/ftw/qhashedstring.cpp')
| -rw-r--r-- | src/qml/qml/ftw/qhashedstring.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/ftw/qhashedstring.cpp b/src/qml/qml/ftw/qhashedstring.cpp index 212a6757d0..8f6c57e029 100644 --- a/src/qml/qml/ftw/qhashedstring.cpp +++ b/src/qml/qml/ftw/qhashedstring.cpp @@ -44,14 +44,14 @@ inline quint32 stringHash(const QChar* data, int length) { - quint32 rv = calculateHash<quint16>((quint16*)data, length) >> HashedString::kHashShift; + quint32 rv = calculateHash((quint16*)data, length); Q_ASSERT(rv == v8::String::ComputeHash((uint16_t*)data, length)); return rv; } inline quint32 stringHash(const char *data, int length) { - quint32 rv = calculateHash<quint8>((quint8*)data, length) >> HashedString::kHashShift; + quint32 rv = calculateHash((quint8*)data, length); Q_ASSERT(rv == v8::String::ComputeHash((char *)data, length)); return rv; } |