diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2014-03-19 13:25:20 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-19 19:58:47 +0100 |
| commit | aea988a3d96a9f9951c6e4c4e0ff8abca726c2ae (patch) | |
| tree | 171a3baa3939c4ec55cf3ad62da494fd22fe43a0 | |
| parent | aae382ab3b2c47946efc10f269fad77d8244b3f4 (diff) | |
Remove 'register' storage class specifier in armv6 atomics
It is deprecated, and produces warnings on recent Clang versions.
Change-Id: I83181dd12c06a600a2f0eafbd83fe6111cf7752c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/corelib/arch/qatomic_armv6.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/arch/qatomic_armv6.h b/src/corelib/arch/qatomic_armv6.h index 31a06541ed..3fd07e0813 100644 --- a/src/corelib/arch/qatomic_armv6.h +++ b/src/corelib/arch/qatomic_armv6.h @@ -171,8 +171,8 @@ bool QBasicAtomicOps<4>::testAndSetRelaxed(T &_q_value, T expectedValue, T newVa template<> template <typename T> inline bool QBasicAtomicOps<4>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW { - register T tempValue; - register int result; + T tempValue; + int result; asm volatile("0:\n" "ldrex %[tempValue], [%[_q_value]]\n" "eors %[result], %[tempValue], %[expectedValue]\n" @@ -352,8 +352,8 @@ bool QBasicAtomicOps<1>::testAndSetRelaxed(T &_q_value, T expectedValue, T newVa template<> template <typename T> inline bool QBasicAtomicOps<1>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW { - register T tempValue; - register T result; + T tempValue; + T result; asm volatile("0:\n" "ldrexb %[tempValue], [%[_q_value]]\n" "eors %[result], %[tempValue], %[expectedValue]\n" @@ -474,8 +474,8 @@ bool QBasicAtomicOps<2>::testAndSetRelaxed(T &_q_value, T expectedValue, T newVa template<> template <typename T> inline bool QBasicAtomicOps<2>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW { - register T tempValue; - register T result; + T tempValue; + T result; asm volatile("0:\n" "ldrexh %[tempValue], [%[_q_value]]\n" "eors %[result], %[tempValue], %[expectedValue]\n" @@ -608,8 +608,8 @@ bool QBasicAtomicOps<8>::testAndSetRelaxed(T &_q_value, T expectedValue, T newVa template<> template <typename T> inline bool QBasicAtomicOps<8>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW { - register T tempValue; - register T result; + T tempValue; + T result; asm volatile("0:\n" "ldrexd %[tempValue], %H[tempValue], [%[_q_value]]\n" "eor %[result], %[tempValue], %[expectedValue]\n" |