aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/v8/qjsvalue_impl_p.h
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2011-10-03 10:50:45 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-10 10:23:17 +0200
commit18c33423a54c24cf13b93115edfd22b6db0f1307 (patch)
treec3001af28bf5783f1b63a2c22fd32e3b060e4753 /src/declarative/qml/v8/qjsvalue_impl_p.h
parent9da11998e8f9b896daf64c2663e06caecd9491d8 (diff)
Use QBasicAtomicInt load() and store() instead of implicit casting
The implicit casts will be unavailable in the near future Change-Id: Ieab3603e500d3621e65f96d970c9935be7f3aa52 Reviewed-on: http://codereview.qt-project.org/6229 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/declarative/qml/v8/qjsvalue_impl_p.h')
-rw-r--r--src/declarative/qml/v8/qjsvalue_impl_p.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/qml/v8/qjsvalue_impl_p.h b/src/declarative/qml/v8/qjsvalue_impl_p.h
index b0ad7669d7..b7ff6a87be 100644
--- a/src/declarative/qml/v8/qjsvalue_impl_p.h
+++ b/src/declarative/qml/v8/qjsvalue_impl_p.h
@@ -51,15 +51,15 @@ public:
QGlobalStaticDeleter(QGlobalStatic<QJSValuePrivate> &_globalStatic)
: globalStatic(_globalStatic)
{
- globalStatic.pointer->ref.ref();
+ globalStatic.pointer.load()->ref.ref();
}
inline ~QGlobalStaticDeleter()
{
- if (!globalStatic.pointer->ref.deref()) { // Logic copy & paste from SharedDataPointer
- delete globalStatic.pointer;
+ if (!globalStatic.pointer.load()->ref.deref()) { // Logic copy & paste from SharedDataPointer
+ delete globalStatic.pointer.load();
}
- globalStatic.pointer = 0;
+ globalStatic.pointer.store(0);
globalStatic.destroyed = true;
}
};