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/thread/qgenericatomic.h | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'src/corelib/thread/qgenericatomic.h') diff --git a/src/corelib/thread/qgenericatomic.h b/src/corelib/thread/qgenericatomic.h index bbdc57ca50..eacde411b9 100644 --- a/src/corelib/thread/qgenericatomic.h +++ b/src/corelib/thread/qgenericatomic.h @@ -60,20 +60,8 @@ QT_END_NAMESPACE #define always_inline #endif -template struct QAtomicIntegerTraits { enum { IsInteger = 0 }; }; - -// these integers are always supported, on all platforms -// - int, unsigned int and char32_t are 32-bit wide -// - long and unsigned long might be 64-bit wide on 64-bit platforms, -// but 64-bit integer support is required anyway -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 = sizeof(char32_t) == sizeof(int) ? 1 : -1 }; }; -#endif +template struct QAtomicOpsSupport { enum { IsSupported = 0 }; }; +template<> struct QAtomicOpsSupport<4> { enum { IsSupported = 1 }; }; template struct QAtomicAdditiveType { -- cgit v1.2.3