diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-31 10:36:57 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-31 11:29:08 +0100 |
| commit | e277575987657aa07444eea9bee99769f039d3b0 (patch) | |
| tree | 549c419596e340c8ad123df44fc75662ed47b2a7 /src/dbus/qdbusargument.cpp | |
| parent | 5761d8546f3ff3802cae85ed5224c2bdd9524452 (diff) | |
Fix most warnings about assignments of QAtomicInt.
Change-Id: Ide409d72d2637b68ec2a85aaca4bc783a7e911e7
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/dbus/qdbusargument.cpp')
| -rw-r--r-- | src/dbus/qdbusargument.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp index 251859d9e3..af800d765d 100644 --- a/src/dbus/qdbusargument.cpp +++ b/src/dbus/qdbusargument.cpp @@ -113,7 +113,7 @@ bool QDBusArgumentPrivate::checkWrite(QDBusArgumentPrivate *&d) if (!d->marshaller()->ok) return false; - if (d->message && d->ref != 1) { + if (d->message && d->ref.load() != 1) { QDBusMarshaller *dd = new QDBusMarshaller(d->capabilities); dd->message = q_dbus_message_copy(d->message); q_dbus_message_iter_init_append(dd->message, &dd->iterator); @@ -154,7 +154,7 @@ bool QDBusArgumentPrivate::checkReadAndDetach(QDBusArgumentPrivate *&d) if (!checkRead(d)) return false; // don't bother - if (d->ref == 1) + if (d->ref.load() == 1) return true; // no need to detach QDBusDemarshaller *dd = new QDBusDemarshaller(d->capabilities); |