From e8b4c49efddb87f4195c74668b5026119eccea56 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 17 Nov 2011 15:52:53 +0100 Subject: qtbase tests: Fix some warnings - Fix warnings about QAtomicPointer/Int usage - Fix some gcc 4.6 warnings about assigned/unused variables Change-Id: Ib4dbf9110f0dad93ad48e97278310f05fad3a82a Reviewed-by: Rohan McGovern --- tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp | 2 +- tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/dbus') diff --git a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp index 6490bfe973..f8f632d667 100644 --- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp +++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp @@ -1107,7 +1107,7 @@ class VirtualObject: public QDBusVirtualObject public: VirtualObject() :success(true) {} - QString introspect(const QString &path) const + QString introspect(const QString & /* path */) const { return QString(); } diff --git a/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp b/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp index e37e4c3ae7..32ede6c97f 100644 --- a/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp +++ b/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp @@ -211,8 +211,8 @@ tst_QDBusThreading::tst_QDBusThreading() void tst_QDBusThreading::joinThreads() { - threadJoin.acquire(threadJoinCount); - threadJoinCount = 0; + threadJoin.acquire(threadJoinCount.load()); + threadJoinCount.store(0); } bool tst_QDBusThreading::waitForSignal(QObject *obj, const char *signal, int delay) -- cgit v1.2.3