Port from QAtomic::load() to loadRelaxed()

Semi-automated, just needed ~20 manual fixes:

$ find \( -iname \*.cpp -or -iname \*.h \) -exec perl -pe 's/(\.|->)load\(\)/$1loadRelaxed\(\)/g' -i \{\} +
$ find \( -iname \*.cpp -or -iname \*.h \) -exec perl -pe 's/(\.|->)store\(/$1storeRelaxed\(/g' -i \{\} +

It can be easily improved (e.g. for store check that there are no commas
after the opening parens). The most common offender is QLibrary::load,
and some code using std::atomic directly.

Change-Id: I07c38a3c8ed32c924ef4999e85c7e45cf48f0f6c
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
 
 

1 files changed, 5 insertions, 5 deletions

diff --git a/src/corelib/thread/qmutex_p.h b/src/corelib/thread/qmutex_p.h
index 5025f836b9..048d8707c4 100644
--- a/src/corelib/thread/qmutex_p.h
+++ b/src/corelib/thread/qmutex_p.h
@@ -99,21 +99,21 @@ public:
     int id;
 
     bool ref() {
-        Q_ASSERT(refCount.load() >= 0);
+        Q_ASSERT(refCount.loadRelaxed() >= 0);
         int c;
         do {
-            c = refCount.load();
+            c = refCount.loadRelaxed();
             if (c == 0)
                 return false;
         } while (!refCount.testAndSetRelaxed(c, c + 1));
-        Q_ASSERT(refCount.load() >= 0);
+        Q_ASSERT(refCount.loadRelaxed() >= 0);
         return true;
     }
     void deref() {
-        Q_ASSERT(refCount.load() >= 0);
+        Q_ASSERT(refCount.loadRelaxed() >= 0);
         if (!refCount.deref())
             release();
-        Q_ASSERT(refCount.load() >= 0);
+        Q_ASSERT(refCount.loadRelaxed() >= 0);
     }
     void release();
     static QMutexPrivate *allocate();