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/arch/qatomic_msvc.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/arch/qatomic_msvc.h')
| -rw-r--r-- | src/corelib/arch/qatomic_msvc.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/arch/qatomic_msvc.h b/src/corelib/arch/qatomic_msvc.h index 7ba70259e9..1cbb1442ed 100644 --- a/src/corelib/arch/qatomic_msvc.h +++ b/src/corelib/arch/qatomic_msvc.h @@ -275,8 +275,7 @@ QT_END_NAMESPACE # define Q_ATOMIC_INT16_FETCH_AND_ADD_IS_ALWAYS_NATIVE # define Q_ATOMIC_INT16_FETCH_AND_ADD_IS_WAIT_FREE -template<> struct QAtomicIntegerTraits<short> { enum { IsInteger = 1 }; }; -template<> struct QAtomicIntegerTraits<unsigned short> { enum { IsInteger = 1 }; }; +template<> struct QAtomicOpsSupport<2> { enum { IsSupported = 1 }; }; #endif #ifdef Q_ATOMIC_INT64_IS_SUPPORTED @@ -292,8 +291,7 @@ template<> struct QAtomicIntegerTraits<unsigned short> { enum { IsInteger = 1 }; # define Q_ATOMIC_INT64_FETCH_AND_ADD_IS_ALWAYS_NATIVE # define Q_ATOMIC_INT64_FETCH_AND_ADD_IS_WAIT_FREE -template<> struct QAtomicIntegerTraits<long long> { enum { IsInteger = 1 }; }; -template<> struct QAtomicIntegerTraits<unsigned long long> { enum { IsInteger = 1 }; }; +template<> struct QAtomicOpsSupport<8> { enum { IsSupported = 1 }; }; #endif //////////////////////////////////////////////////////////////////////////////////////////////////// |