diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-05-17 17:33:39 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-05-20 20:07:37 +0200 |
| commit | f6685a271677429ed2dac4232421a7bb18a78e0c (patch) | |
| tree | 14bb587e3baeb657805f14015caa3b806a318efa /src/corelib/kernel/qobject.cpp | |
| parent | e02a171a47e87048d16faf7167c0fecd46a176b5 (diff) | |
| download | qtbase-f6685a271677429ed2dac4232421a7bb18a78e0c.tar.gz | |
Make all loads of QAtomicPointer QObjectPrivate::threadData explicit
Replace implicit conversions from QAtomicPointer<T> → T* with the
equivalent, but explicit, loadAcquire().
This is in preparation of deprecating the implicit QAtomic<T> ↔ T
conversions.
Change-Id: I6c8476a705c3996ef724dd63b58d9526d1a39af7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qobject.cpp')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index e438c11513..63dfb1cba0 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -3674,7 +3674,7 @@ QObjectPrivate::Connection *QMetaObjectPrivate::connect(const QObject *sender, c->sender = s; c->signal_index = signal_index; c->receiver.storeRelaxed(r); - QThreadData *td = r->d_func()->threadData; + QThreadData *td = r->d_func()->threadData.loadAcquire(); td->ref(); c->receiverThreadData.storeRelaxed(td); c->method_relative = method_index; @@ -5304,7 +5304,7 @@ QMetaObject::Connection QObjectPrivate::connectImpl(const QObject *sender, int s std::unique_ptr<QObjectPrivate::Connection> c{new QObjectPrivate::Connection}; c->sender = s; c->signal_index = signal_index; - QThreadData *td = r->d_func()->threadData; + QThreadData *td = r->d_func()->threadData.loadAcquire(); td->ref(); c->receiverThreadData.storeRelaxed(td); c->receiver.storeRelaxed(r); |