diff options
Diffstat (limited to 'src/corelib/thread/qbasicatomic.h')
| -rw-r--r-- | src/corelib/thread/qbasicatomic.h | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index 782ae90698..9fa12ba811 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -51,33 +51,17 @@ #elif defined(Q_CC_MSVC) # include <QtCore/qatomic_msvc.h> -// Operating system dependent implementation -#elif defined(Q_OS_INTEGRITY) -# include "QtCore/qatomic_integrity.h" -#elif defined(Q_OS_VXWORKS) -# include "QtCore/qatomic_vxworks.h" - // Processor dependent implementation -#elif defined(Q_PROCESSOR_ALPHA) -# include "QtCore/qatomic_alpha.h" #elif defined(Q_PROCESSOR_ARM_V7) && defined(Q_PROCESSOR_ARM_32) # include "QtCore/qatomic_armv7.h" #elif defined(Q_PROCESSOR_ARM_V6) && defined(Q_PROCESSOR_ARM_32) # include "QtCore/qatomic_armv6.h" #elif defined(Q_PROCESSOR_ARM_V5) && defined(Q_PROCESSOR_ARM_32) # include "QtCore/qatomic_armv5.h" -#elif defined(Q_PROCESSOR_BFIN) -# include "QtCore/qatomic_bfin.h" #elif defined(Q_PROCESSOR_IA64) # include "QtCore/qatomic_ia64.h" #elif defined(Q_PROCESSOR_MIPS) # include "QtCore/qatomic_mips.h" -#elif defined(Q_PROCESSOR_POWER) -# include "QtCore/qatomic_power.h" -#elif defined(Q_PROCESSOR_S390) -# include "QtCore/qatomic_s390.h" -#elif defined(Q_PROCESSOR_SH4A) -# include "QtCore/qatomic_sh4a.h" #elif defined(Q_PROCESSOR_SPARC) # include "QtCore/qatomic_sparc.h" #elif defined(Q_PROCESSOR_X86) @@ -98,9 +82,6 @@ # error "Qt has not been ported to this platform" #endif -// Only include if the implementation has been ported to QAtomicOps -#ifndef QOLDBASICATOMIC_H - QT_BEGIN_NAMESPACE #if 0 @@ -133,7 +114,7 @@ class QBasicAtomicInteger public: typedef QAtomicOps<T> Ops; // static check that this is a valid integer - typedef char PermittedIntegerType[QAtomicIntegerTraits<T>::IsInteger ? 1 : -1]; + Q_STATIC_ASSERT_X(QAtomicIntegerTraits<T>::IsInteger, "Template parameter is not a supported integer on this platform"); typename Ops::Type _q_value; @@ -266,6 +247,4 @@ public: QT_END_NAMESPACE -#endif // QOLDBASICATOMIC_H - #endif // QBASICATOMIC_H |