From fd0d576709fff48bc23444b3a30a86e92c625101 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 2 Dec 2013 19:39:36 -0800 Subject: Centralize support for QBasicAtomic for ints and longs No need to redefine everywhere, since they're required to be supported. Change-Id: I2bdbbd0b0c44871e3bd0edcf0289fc58dd50ff31 Reviewed-by: Lars Knoll --- src/corelib/arch/qatomic_armv5.h | 3 --- src/corelib/arch/qatomic_armv6.h | 13 ------------- src/corelib/arch/qatomic_bootstrap.h | 1 - src/corelib/arch/qatomic_cxx11.h | 5 ----- src/corelib/arch/qatomic_gcc.h | 6 ------ src/corelib/arch/qatomic_ia64.h | 5 ----- src/corelib/arch/qatomic_mips.h | 10 ---------- src/corelib/arch/qatomic_msvc.h | 8 -------- src/corelib/arch/qatomic_unix.h | 2 -- src/corelib/arch/qatomic_x86.h | 6 ------ 10 files changed, 59 deletions(-) (limited to 'src/corelib/arch') diff --git a/src/corelib/arch/qatomic_armv5.h b/src/corelib/arch/qatomic_armv5.h index b583ec662c..237ff5f254 100644 --- a/src/corelib/arch/qatomic_armv5.h +++ b/src/corelib/arch/qatomic_armv5.h @@ -72,9 +72,6 @@ QT_END_NAMESPACE # error "Qt is misconfigured: this ARMv5 implementation is only possible on Linux" #endif -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; - template struct QBasicAtomicOps: QGenericAtomicOps > { // kernel places a restartable cmpxchg implementation at a fixed address diff --git a/src/corelib/arch/qatomic_armv6.h b/src/corelib/arch/qatomic_armv6.h index 08b2b02133..b8401d185d 100644 --- a/src/corelib/arch/qatomic_armv6.h +++ b/src/corelib/arch/qatomic_armv6.h @@ -69,16 +69,6 @@ QT_END_NAMESPACE #define Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_ALWAYS_NATIVE #define Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_ALWAYS_NATIVE -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; -#if defined(Q_COMPILER_UNICODE_STRINGS) && !defined(Q_PROCESSOR_ARM_V6) -// for ARMv5, ensure that char32_t (an uint_least32_t), is 32-bit -// it's extremely unlikely it won't be on a 32-bit ARM, but just to be sure -// For ARMv6 and up, we're sure it works, but the definition is below -template<> struct QAtomicIntegerTraits -{ enum { IsInteger = sizeof(char32_t) == sizeof(int) ? 1 : -1 }; }; -#endif - template struct QBasicAtomicOps: QGenericAtomicOps > { template @@ -225,14 +215,11 @@ 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 }; }; template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; # ifdef Q_COMPILER_UNICODE_STRINGS template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; # endif #define Q_ATOMIC_INT8_IS_SUPPORTED diff --git a/src/corelib/arch/qatomic_bootstrap.h b/src/corelib/arch/qatomic_bootstrap.h index 160e0abdf3..7f17387c9c 100644 --- a/src/corelib/arch/qatomic_bootstrap.h +++ b/src/corelib/arch/qatomic_bootstrap.h @@ -54,7 +54,6 @@ QT_END_NAMESPACE #pragma qt_sync_stop_processing #endif -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; template struct QAtomicOps: QGenericAtomicOps > { typedef T Type; diff --git a/src/corelib/arch/qatomic_cxx11.h b/src/corelib/arch/qatomic_cxx11.h index 55e71e1e88..87eb7b3fab 100644 --- a/src/corelib/arch/qatomic_cxx11.h +++ b/src/corelib/arch/qatomic_cxx11.h @@ -70,21 +70,16 @@ QT_END_NAMESPACE #define Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_SOMETIMES_NATIVE #define Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_SOMETIMES_NATIVE -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 }; }; -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 }; }; -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; # endif #define Q_ATOMIC_INT8_IS_SUPPORTED diff --git a/src/corelib/arch/qatomic_gcc.h b/src/corelib/arch/qatomic_gcc.h index 4038c6dee0..7a8672510f 100644 --- a/src/corelib/arch/qatomic_gcc.h +++ b/src/corelib/arch/qatomic_gcc.h @@ -53,12 +53,6 @@ QT_END_NAMESPACE #pragma qt_sync_stop_processing #endif -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; -#ifdef Q_COMPILER_UNICODE_STRINGS -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; -#endif - #define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_SOMETIMES_NATIVE #define Q_ATOMIC_INT_TEST_AND_SET_IS_SOMETIMES_NATIVE #define Q_ATOMIC_INT_FETCH_AND_STORE_IS_SOMETIMES_NATIVE diff --git a/src/corelib/arch/qatomic_ia64.h b/src/corelib/arch/qatomic_ia64.h index 8c0793965e..2abba95c6c 100644 --- a/src/corelib/arch/qatomic_ia64.h +++ b/src/corelib/arch/qatomic_ia64.h @@ -123,21 +123,16 @@ QT_END_NAMESPACE #define Q_ATOMIC_INT64_FETCH_AND_ADD_IS_ALWAYS_NATIVE -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 }; }; -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 }; }; -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; # endif template struct QBasicAtomicOps: QGenericAtomicOps > diff --git a/src/corelib/arch/qatomic_mips.h b/src/corelib/arch/qatomic_mips.h index 6eb9613e31..e9a4e31c75 100644 --- a/src/corelib/arch/qatomic_mips.h +++ b/src/corelib/arch/qatomic_mips.h @@ -69,16 +69,6 @@ QT_END_NAMESPACE #define Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_ALWAYS_NATIVE #define Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_ALWAYS_NATIVE -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; -#if defined(Q_COMPILER_UNICODE_STRINGS) && !defined(Q_PROCESSOR_MIPS_64) -// for MIPS32, ensure that char32_t (an uint_least32_t), is 32-bit -// it's extremely unlikely it won't be on a 32-bit MIPS, but just to be sure -// For MIPS64, we're sure it works, but the definition is below -template<> struct QAtomicIntegerTraits -{ enum { IsInteger = sizeof(char32_t) == sizeof(int) ? 1 : -1 }; }; -#endif - template struct QBasicAtomicOps: QGenericAtomicOps > { template diff --git a/src/corelib/arch/qatomic_msvc.h b/src/corelib/arch/qatomic_msvc.h index 8a94ea3d59..7ba70259e9 100644 --- a/src/corelib/arch/qatomic_msvc.h +++ b/src/corelib/arch/qatomic_msvc.h @@ -301,14 +301,6 @@ template<> struct QAtomicIntegerTraits { enum { IsInteger = template struct QAtomicWindowsType { typedef typename QIntegerForSize::Signed Type; }; template <> struct QAtomicWindowsType<4> { typedef long Type; }; -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 QAtomicOpsBySize : QGenericAtomicOps > { diff --git a/src/corelib/arch/qatomic_unix.h b/src/corelib/arch/qatomic_unix.h index 017adabbe2..493927fac0 100644 --- a/src/corelib/arch/qatomic_unix.h +++ b/src/corelib/arch/qatomic_unix.h @@ -74,8 +74,6 @@ QT_END_NAMESPACE #define Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_NOT_NATIVE #define Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_NOT_NATIVE -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; diff --git a/src/corelib/arch/qatomic_x86.h b/src/corelib/arch/qatomic_x86.h index 608b3db0ff..6ed283396d 100644 --- a/src/corelib/arch/qatomic_x86.h +++ b/src/corelib/arch/qatomic_x86.h @@ -89,9 +89,6 @@ QT_END_NAMESPACE #define Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_ALWAYS_NATIVE #define Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_WAIT_FREE -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; - template struct QBasicAtomicOps: QGenericAtomicOps > { static inline Q_DECL_CONSTEXPR bool isReferenceCountingNative() Q_DECL_NOTHROW { return true; } @@ -125,14 +122,11 @@ 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 }; }; template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; # ifdef Q_COMPILER_UNICODE_STRINGS template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; -template<> struct QAtomicIntegerTraits { enum { IsInteger = 1 }; }; # endif -- cgit v1.2.3