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, 18 insertions, 18 deletions

diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
index 6ae2aab5b9..7db7d71b1f 100644
--- a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
+++ b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
@@ -91,7 +91,7 @@ void tst_QArrayData::referenceCounting()
         // Reference counting initialized to 1 (owned)
         QArrayData array = { { Q_BASIC_ATOMIC_INITIALIZER(1) }, 0, 0, 0, 0 };
 
-        QCOMPARE(array.ref.atomic.load(), 1);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), 1);
 
         QVERIFY(!array.ref.isStatic());
 #if !defined(QT_NO_UNSHARABLE_CONTAINERS)
@@ -99,19 +99,19 @@ void tst_QArrayData::referenceCounting()
 #endif
 
         QVERIFY(array.ref.ref());
-        QCOMPARE(array.ref.atomic.load(), 2);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), 2);
 
         QVERIFY(array.ref.deref());
-        QCOMPARE(array.ref.atomic.load(), 1);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), 1);
 
         QVERIFY(array.ref.ref());
-        QCOMPARE(array.ref.atomic.load(), 2);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), 2);
 
         QVERIFY(array.ref.deref());
-        QCOMPARE(array.ref.atomic.load(), 1);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), 1);
 
         QVERIFY(!array.ref.deref());
-        QCOMPARE(array.ref.atomic.load(), 0);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), 0);
 
         // Now would be a good time to free/release allocated data
     }
@@ -121,17 +121,17 @@ void tst_QArrayData::referenceCounting()
         // Reference counting initialized to 0 (non-sharable)
         QArrayData array = { { Q_BASIC_ATOMIC_INITIALIZER(0) }, 0, 0, 0, 0 };
 
-        QCOMPARE(array.ref.atomic.load(), 0);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), 0);
 
         QVERIFY(!array.ref.isStatic());
         QVERIFY(!array.ref.isSharable());
 
         QVERIFY(!array.ref.ref());
         // Reference counting fails, data should be copied
-        QCOMPARE(array.ref.atomic.load(), 0);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), 0);
 
         QVERIFY(!array.ref.deref());
-        QCOMPARE(array.ref.atomic.load(), 0);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), 0);
 
         // Free/release data
     }
@@ -141,7 +141,7 @@ void tst_QArrayData::referenceCounting()
         // Reference counting initialized to -1 (static read-only data)
         QArrayData array = { Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, 0, 0 };
 
-        QCOMPARE(array.ref.atomic.load(), -1);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), -1);
 
         QVERIFY(array.ref.isStatic());
 #if !defined(QT_NO_UNSHARABLE_CONTAINERS)
@@ -149,10 +149,10 @@ void tst_QArrayData::referenceCounting()
 #endif
 
         QVERIFY(array.ref.ref());
-        QCOMPARE(array.ref.atomic.load(), -1);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), -1);
 
         QVERIFY(array.ref.deref());
-        QCOMPARE(array.ref.atomic.load(), -1);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), -1);
 
     }
 }
@@ -168,8 +168,8 @@ void tst_QArrayData::sharedNullEmpty()
     QVERIFY(empty->ref.isStatic());
     QVERIFY(empty->ref.isShared());
 
-    QCOMPARE(null->ref.atomic.load(), -1);
-    QCOMPARE(empty->ref.atomic.load(), -1);
+    QCOMPARE(null->ref.atomic.loadRelaxed(), -1);
+    QCOMPARE(empty->ref.atomic.loadRelaxed(), -1);
 
 #if !defined(QT_NO_UNSHARABLE_CONTAINERS)
     QVERIFY(null->ref.isSharable());
@@ -179,14 +179,14 @@ void tst_QArrayData::sharedNullEmpty()
     QVERIFY(null->ref.ref());
     QVERIFY(empty->ref.ref());
 
-    QCOMPARE(null->ref.atomic.load(), -1);
-    QCOMPARE(empty->ref.atomic.load(), -1);
+    QCOMPARE(null->ref.atomic.loadRelaxed(), -1);
+    QCOMPARE(empty->ref.atomic.loadRelaxed(), -1);
 
     QVERIFY(null->ref.deref());
     QVERIFY(empty->ref.deref());
 
-    QCOMPARE(null->ref.atomic.load(), -1);
-    QCOMPARE(empty->ref.atomic.load(), -1);
+    QCOMPARE(null->ref.atomic.loadRelaxed(), -1);
+    QCOMPARE(empty->ref.atomic.loadRelaxed(), -1);
 
     QVERIFY(null != empty);