From aba30f02348c60ea785c374d12e1f3998dc4cb14 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 2 Dec 2013 19:50:29 -0800 Subject: Replace the type-based QAtomicIntegerTraits with a size-based one This simplifies the code a lot and avoids silly mistakes where a specific integer type is missing (such as char16_t). Change-Id: Id91dfd1919e783e0a9af7bfa093ca560a01b22d1 Reviewed-by: Lars Knoll --- src/corelib/arch/qatomic_armv6.h | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'src/corelib/arch/qatomic_armv6.h') diff --git a/src/corelib/arch/qatomic_armv6.h b/src/corelib/arch/qatomic_armv6.h index b8401d185d..37df64141c 100644 --- a/src/corelib/arch/qatomic_armv6.h +++ b/src/corelib/arch/qatomic_armv6.h @@ -210,17 +210,9 @@ T QBasicAtomicOps<4>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveTy || defined(__ARM_ARCH_6K__) // LDREXB, LDREXH and LDREXD are available on ARMv6K or higher -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; - -# ifdef Q_COMPILER_UNICODE_STRINGS -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; -# endif +template<> struct QAtomicOpsSupport<1> { enum { IsSupported = 1 }; }; +template<> struct QAtomicOpsSupport<2> { enum { IsSupported = 1 }; }; +template<> struct QAtomicOpsSupport<8> { enum { IsSupported = 1 }; }; #define Q_ATOMIC_INT8_IS_SUPPORTED #define Q_ATOMIC_INT8_REFERENCE_COUNTING_IS_ALWAYS_NATIVE -- cgit v1.2.3