diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-17 14:15:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-17 14:43:26 +0100 |
| commit | e5ac4afbf954a3e1616ce8543d46ddc668d0374f (patch) | |
| tree | be6d97001edebd5cb74c64aaf0010f3cc76a7293 /src/corelib/tools/qhash.h | |
| parent | e3ed95dd44b95b6e9361b562807e711d7ce5a58b (diff) | |
| parent | 03c1a6ac717e3c5693653a5e294214056bda970e (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
mkspecs/features/mac/default_post.prf
mkspecs/features/uikit/default_post.prf
Change-Id: I2a6f783451f2ac9eb4c1a050f605435d2dacf218
Diffstat (limited to 'src/corelib/tools/qhash.h')
| -rw-r--r-- | src/corelib/tools/qhash.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h index 6a2d7bdd11..66b5e75a1a 100644 --- a/src/corelib/tools/qhash.h +++ b/src/corelib/tools/qhash.h @@ -744,7 +744,7 @@ Q_INLINE_TEMPLATE T &QHash<Key, T>::operator[](const Key &akey) Node **node = findNode(akey, &h); if (*node == e) { if (d->willGrow()) - node = findNode(akey, &h); + node = findNode(akey, h); return createNode(h, akey, T(), node)->value; } return (*node)->value; @@ -760,11 +760,11 @@ Q_INLINE_TEMPLATE typename QHash<Key, T>::iterator QHash<Key, T>::insert(const K Node **node = findNode(akey, &h); if (*node == e) { if (d->willGrow()) - node = findNode(akey, &h); + node = findNode(akey, h); return iterator(createNode(h, akey, avalue, node)); } - if (!QtPrivate::is_same<T, QHashDummyValue>::value) + if (!std::is_same<T, QHashDummyValue>::value) (*node)->value = avalue; return iterator(*node); } @@ -961,8 +961,7 @@ QPair<typename QHash<Key, T>::iterator, typename QHash<Key, T>::iterator> QHash< template <class Key, class T> QPair<typename QHash<Key, T>::const_iterator, typename QHash<Key, T>::const_iterator> QHash<Key, T>::equal_range(const Key &akey) const Q_DECL_NOTHROW { - uint h; - Node *node = *findNode(akey, &h); + Node *node = *findNode(akey); const_iterator firstIt = const_iterator(node); if (node != e) { |