summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qlinkedlist.cpp
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2011-09-09 11:10:48 +0200
committerQt by Nokia <qt-info@nokia.com>2011-09-26 07:50:20 +0200
commitf8f501ec9853231805097a5dbaf0ea99196e8014 (patch)
tree181a0f1d6f3bc4297a6cb7c42728234649df22c3 /src/corelib/tools/qlinkedlist.cpp
parent1173d0420e341dc6d38c89e5bc4295a57da7ea74 (diff)
Make QLinkedListData::shared_null const
Similar to QList, QMap, QVector, QByteArray and QString, keep the shared_null in shareable memory and never modify it. Change-Id: I70b484d528c397a9d205b1418b6dc920c69dc725 Reviewed-on: http://codereview.qt-project.org/4532 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/corelib/tools/qlinkedlist.cpp')
-rw-r--r--src/corelib/tools/qlinkedlist.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/tools/qlinkedlist.cpp b/src/corelib/tools/qlinkedlist.cpp
index 97298dde3d..16105530bf 100644
--- a/src/corelib/tools/qlinkedlist.cpp
+++ b/src/corelib/tools/qlinkedlist.cpp
@@ -43,9 +43,10 @@
QT_BEGIN_NAMESPACE
-QLinkedListData QLinkedListData::shared_null = {
- &QLinkedListData::shared_null, &QLinkedListData::shared_null,
- Q_BASIC_ATOMIC_INITIALIZER(1), 0, true
+const QLinkedListData QLinkedListData::shared_null = {
+ const_cast<QLinkedListData *>(&QLinkedListData::shared_null),
+ const_cast<QLinkedListData *>(&QLinkedListData::shared_null),
+ Q_REFCOUNT_INITIALIZER(-1), 0, true
};
/*! \class QLinkedList