From 34fe9232dbf6a9fe58ebc4c7680bb67d2f642c40 Mon Sep 17 00:00:00 2001
From: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Date: Mon, 10 Jun 2019 11:08:29 +0200
Subject: 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>
---
 .../opengl/qopenglfunctions_4_3_compatibility.cpp  | 44 +++++++++++-----------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp')

diff --git a/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp
index 131ebc810f..5c0c711d1c 100644
--- a/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp
@@ -97,91 +97,91 @@ QOpenGLFunctions_4_3_Compatibility::~QOpenGLFunctions_4_3_Compatibility()
 {
     if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-        Q_ASSERT(d_1_0_Core->refs.load());
+        Q_ASSERT(d_1_0_Core->refs.loadRelaxed());
     }
     if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-        Q_ASSERT(d_1_1_Core->refs.load());
+        Q_ASSERT(d_1_1_Core->refs.loadRelaxed());
     }
     if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-        Q_ASSERT(d_1_2_Core->refs.load());
+        Q_ASSERT(d_1_2_Core->refs.loadRelaxed());
     }
     if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-        Q_ASSERT(d_1_3_Core->refs.load());
+        Q_ASSERT(d_1_3_Core->refs.loadRelaxed());
     }
     if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-        Q_ASSERT(d_1_4_Core->refs.load());
+        Q_ASSERT(d_1_4_Core->refs.loadRelaxed());
     }
     if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-        Q_ASSERT(d_1_5_Core->refs.load());
+        Q_ASSERT(d_1_5_Core->refs.loadRelaxed());
     }
     if (d_2_0_Core) {
         d_2_0_Core->refs.deref();
-        Q_ASSERT(d_2_0_Core->refs.load());
+        Q_ASSERT(d_2_0_Core->refs.loadRelaxed());
     }
     if (d_2_1_Core) {
         d_2_1_Core->refs.deref();
-        Q_ASSERT(d_2_1_Core->refs.load());
+        Q_ASSERT(d_2_1_Core->refs.loadRelaxed());
     }
     if (d_3_0_Core) {
         d_3_0_Core->refs.deref();
-        Q_ASSERT(d_3_0_Core->refs.load());
+        Q_ASSERT(d_3_0_Core->refs.loadRelaxed());
     }
     if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-        Q_ASSERT(d_3_1_Core->refs.load());
+        Q_ASSERT(d_3_1_Core->refs.loadRelaxed());
     }
     if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-        Q_ASSERT(d_3_2_Core->refs.load());
+        Q_ASSERT(d_3_2_Core->refs.loadRelaxed());
     }
     if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-        Q_ASSERT(d_3_3_Core->refs.load());
+        Q_ASSERT(d_3_3_Core->refs.loadRelaxed());
     }
     if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-        Q_ASSERT(d_4_0_Core->refs.load());
+        Q_ASSERT(d_4_0_Core->refs.loadRelaxed());
     }
     if (d_4_1_Core) {
         d_4_1_Core->refs.deref();
-        Q_ASSERT(d_4_1_Core->refs.load());
+        Q_ASSERT(d_4_1_Core->refs.loadRelaxed());
     }
     if (d_4_2_Core) {
         d_4_2_Core->refs.deref();
-        Q_ASSERT(d_4_2_Core->refs.load());
+        Q_ASSERT(d_4_2_Core->refs.loadRelaxed());
     }
     if (d_4_3_Core) {
         d_4_3_Core->refs.deref();
-        Q_ASSERT(d_4_3_Core->refs.load());
+        Q_ASSERT(d_4_3_Core->refs.loadRelaxed());
     }
     if (d_1_0_Deprecated) {
         d_1_0_Deprecated->refs.deref();
-        Q_ASSERT(d_1_0_Deprecated->refs.load());
+        Q_ASSERT(d_1_0_Deprecated->refs.loadRelaxed());
     }
     if (d_1_1_Deprecated) {
         d_1_1_Deprecated->refs.deref();
-        Q_ASSERT(d_1_1_Deprecated->refs.load());
+        Q_ASSERT(d_1_1_Deprecated->refs.loadRelaxed());
     }
     if (d_1_2_Deprecated) {
         d_1_2_Deprecated->refs.deref();
-        Q_ASSERT(d_1_2_Deprecated->refs.load());
+        Q_ASSERT(d_1_2_Deprecated->refs.loadRelaxed());
     }
     if (d_1_3_Deprecated) {
         d_1_3_Deprecated->refs.deref();
-        Q_ASSERT(d_1_3_Deprecated->refs.load());
+        Q_ASSERT(d_1_3_Deprecated->refs.loadRelaxed());
     }
     if (d_1_4_Deprecated) {
         d_1_4_Deprecated->refs.deref();
-        Q_ASSERT(d_1_4_Deprecated->refs.load());
+        Q_ASSERT(d_1_4_Deprecated->refs.loadRelaxed());
     }
     if (d_3_3_Deprecated) {
         d_3_3_Deprecated->refs.deref();
-        Q_ASSERT(d_3_3_Deprecated->refs.load());
+        Q_ASSERT(d_3_3_Deprecated->refs.loadRelaxed());
     }
 }
 
-- 
cgit v1.2.3