From 3f1a4be30263a676b7e188bf6cfa809c7788c87f Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Tue, 28 Feb 2012 15:46:01 +0100
Subject: Make loadAcquire const.

Change-Id: Iad2d60d1abe363a3b85eaf152861d0979a997d81
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/thread/qbasicatomic.h   | 4 ++--
 src/corelib/thread/qgenericatomic.h | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/corelib/thread')

diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h
index 96338c62dc..01a69dbd8b 100644
--- a/src/corelib/thread/qbasicatomic.h
+++ b/src/corelib/thread/qbasicatomic.h
@@ -136,7 +136,7 @@ public:
 
     // Atomic API, implemented in qatomic_XXX.h
 
-    T loadAcquire() { return Ops::loadAcquire(_q_value); }
+    T loadAcquire() const { return Ops::loadAcquire(_q_value); }
     void storeRelease(T newValue) { Ops::storeRelease(_q_value, newValue); }
 
     static bool isReferenceCountingNative() { return Ops::isReferenceCountingNative(); }
@@ -206,7 +206,7 @@ public:
     void store(Type newValue) { _q_value = newValue; }
 
     // Atomic API, implemented in qatomic_XXX.h
-    Type loadAcquire() { return Ops::loadAcquire(_q_value); }
+    Type loadAcquire() const { return Ops::loadAcquire(_q_value); }
     void storeRelease(Type newValue) { Ops::storeRelease(_q_value, newValue); }
 
     static bool isTestAndSetNative() { return Ops::isTestAndSetNative(); }
diff --git a/src/corelib/thread/qgenericatomic.h b/src/corelib/thread/qgenericatomic.h
index f4d5e2f8d9..34c040c39b 100644
--- a/src/corelib/thread/qgenericatomic.h
+++ b/src/corelib/thread/qgenericatomic.h
@@ -85,7 +85,7 @@ template <typename BaseClass> struct QGenericAtomicOps
     static void orderedMemoryFence() { }
 
     template <typename T> static inline always_inline
-    T load(T &_q_value)
+    T load(const T &_q_value)
     {
         return _q_value;
     }
@@ -97,9 +97,9 @@ template <typename BaseClass> struct QGenericAtomicOps
     }
 
     template <typename T> static inline always_inline
-    T loadAcquire(T &_q_value)
+    T loadAcquire(const T &_q_value)
     {
-        T tmp = *static_cast<volatile T *>(&_q_value);
+        T tmp = *static_cast<const volatile T *>(&_q_value);
         BaseClass::acquireMemoryFence();
         return tmp;
     }
-- 
cgit v1.2.3