diff options
| author | Thiago Macieira <thiago@kde.org> | 2011-07-05 23:46:19 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-03 07:57:41 +0200 |
| commit | 5bfeab8749ce6820d55135b81665a7231d3b1504 (patch) | |
| tree | 152569571114c53d4cdfaa0013307267cb3379a6 /src/corelib/tools/qshareddata.h | |
| parent | 5613c9722adee921e16682c0a035f2a7567bd346 (diff) | |
Make all uses of QBasicAtomicInt and Pointer use load() and store()
Most of these changes are search-and-replace of d->ref ==, d->ref !=
and d->ref =.
The QBasicAtomicPointer in QObjectPrivate::Connection didn't need to
be basic, so I made it QAtomicPointer.
Change-Id: Ie3271abd1728af599f9ab17c6f4868e475f17bb6
Reviewed-on: http://codereview.qt-project.org/5030
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/tools/qshareddata.h')
| -rw-r--r-- | src/corelib/tools/qshareddata.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qshareddata.h b/src/corelib/tools/qshareddata.h index 811b186e8b..6de6a19289 100644 --- a/src/corelib/tools/qshareddata.h +++ b/src/corelib/tools/qshareddata.h @@ -72,7 +72,7 @@ public: typedef T Type; typedef T *pointer; - inline void detach() { if (d && d->ref != 1) detach_helper(); } + inline void detach() { if (d && d->ref.load() != 1) detach_helper(); } inline T &operator*() { detach(); return *d; } inline const T &operator*() const { return *d; } inline T *operator->() { detach(); return d; } @@ -145,7 +145,7 @@ public: inline T *data() const { return d; } inline const T *constData() const { return d; } - inline void detach() { if (d && d->ref != 1) detach_helper(); } + inline void detach() { if (d && d->ref.load() != 1) detach_helper(); } inline void reset() { |