AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make QHashData::shared_null const

Browse Source 
Similar to QLinkedList QList, QMap, QVector, QByteArray and QString,
keep the shared_null in shareable memory and never modify it.

Change-Id: Ia8b72ef0288575bed658153d9d54434580988bda
Reviewed-on: http://codereview.qt-project.org/4533
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Bradley T. Hughes 2011-09-09 11:18:28 +02:00 committed by Qt by Nokia
parent f6e0aa3a0f
commit 1173d0420e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/tools/qhash.cpp
View File

@ -165,8 +165,8 @@ static int countBits(int hint)
*/
const int MinNumBits = 4;
QHashData QHashData::shared_null = {
0, 0, Q_BASIC_ATOMIC_INITIALIZER(1), 0, 0, MinNumBits, 0, 0, true, false, 0
const QHashData QHashData::shared_null = {
0, 0, Q_REFCOUNT_INITIALIZER(-1), 0, 0, MinNumBits, 0, 0, true, false, 0
};
void *QHashData::allocateNode()

8
src/corelib/tools/qhash.h
View File

@ -42,11 +42,11 @@
#ifndef QHASH_H
#define QHASH_H
#include <QtCore/qatomic.h>
#include <QtCore/qchar.h>
#include <QtCore/qiterator.h>
#include <QtCore/qlist.h>
#include <QtCore/qpair.h>
#include <QtCore/qrefcount.h>
QT_BEGIN_HEADER
@ -118,7 +118,7 @@ struct Q_CORE_EXPORT QHashData
Node *fakeNext;
Node **buckets;
QBasicAtomicInt ref;
QtPrivate::RefCount ref;
int size;
int nodeSize;
short userNumBits;
@ -148,7 +148,7 @@ struct Q_CORE_EXPORT QHashData
static Node *nextNode(Node *node);
static Node *previousNode(Node *node);
static QHashData shared_null;
static const QHashData shared_null;
};
inline void QHashData::mightGrow() // ### Qt 5: eliminate
@ -278,7 +278,7 @@ class QHash
#endif
public:
inline QHash() : d(&QHashData::shared_null) { d->ref.ref(); }
inline QHash() : d(const_cast<QHashData *>(&QHashData::shared_null)) { }
inline QHash(const QHash<Key, T> &other) : d(other.d) { d->ref.ref(); if (!d->sharable) detach(); }
inline ~QHash() { if (!d->ref.deref()) freeData(d); }