diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2013-12-02 19:50:29 -0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-30 18:06:27 +0100 |
commit | aba30f02348c60ea785c374d12e1f3998dc4cb14 (patch) | |
tree | 1c00adbb5db40e6b372a88e24d9345b38e3461c4 /src/corelib/thread/qgenericatomic.h | |
parent | fd0d576709fff48bc23444b3a30a86e92c625101 (diff) |
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 <lars.knoll@digia.com>
Diffstat (limited to 'src/corelib/thread/qgenericatomic.h')
-rw-r--r-- | src/corelib/thread/qgenericatomic.h | 16 |
1 files changed, 2 insertions, 14 deletions
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<typename T> 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<int> { enum { IsInteger = 1 }; }; -template<> struct QAtomicIntegerTraits<unsigned int> { enum { IsInteger = 1 }; }; -template<> struct QAtomicIntegerTraits<long> { enum { IsInteger = 1 }; }; -template<> struct QAtomicIntegerTraits<unsigned long> { enum { IsInteger = 1 }; }; -#ifdef Q_COMPILER_UNICODE_STRINGS -template<> struct QAtomicIntegerTraits<char32_t> -{ enum { IsInteger = sizeof(char32_t) == sizeof(int) ? 1 : -1 }; }; -#endif +template<int> struct QAtomicOpsSupport { enum { IsSupported = 0 }; }; +template<> struct QAtomicOpsSupport<4> { enum { IsSupported = 1 }; }; template <typename T> struct QAtomicAdditiveType { |