diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-02-13 06:56:30 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-13 22:15:36 +0100 |
| commit | 5c5498ca0d2f8f1876836730b29a98e97a68487e (patch) | |
| tree | 9b87f7e500b5faf8b41a1dbb827b131ffd3a2b12 /src/corelib/thread | |
| parent | df4746db04087ed8641b2fbc2a8d0cf29a6993fd (diff) | |
Remove Windows specific code from qoldbasicatomic.h
This header is not used on Windows anymore, so remove the dead #ifdefs.
Change-Id: I76cfbd13c9fff0eab87cc69e8ca1e0d5ccab9e3a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qoldbasicatomic.h | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/src/corelib/thread/qoldbasicatomic.h b/src/corelib/thread/qoldbasicatomic.h index 2bd62f6942..7482d95a11 100644 --- a/src/corelib/thread/qoldbasicatomic.h +++ b/src/corelib/thread/qoldbasicatomic.h @@ -61,13 +61,7 @@ QT_END_HEADER class Q_CORE_EXPORT QBasicAtomicInt { public: -#if defined(QT_ARCH_WINDOWS) || defined(QT_ARCH_WINDOWSCE) - union { // needed for Q_BASIC_ATOMIC_INITIALIZER - volatile long _q_value; - }; -#else volatile int _q_value; -#endif // Atomic API, implemented in qatomic_XXX.h @@ -111,19 +105,7 @@ template <typename T> class QBasicAtomicPointer { public: -#if defined(QT_ARCH_WINDOWS) || defined(QT_ARCH_WINDOWSCE) - union { - T * volatile _q_value; -# if !defined(Q_OS_WINCE) && !defined(__i386__) && !defined(_M_IX86) - qint64 -# else - long -# endif - volatile _q_value_integral; - }; -#else T * volatile _q_value; -#endif // Atomic API, implemented in qatomic_XXX.h @@ -157,11 +139,7 @@ public: T *fetchAndAddOrdered(qptrdiff valueToAdd); }; -#if defined(QT_ARCH_WINDOWS) || defined(QT_ARCH_WINDOWSCE) -# define Q_BASIC_ATOMIC_INITIALIZER(a) { {(a)} } -#else -# define Q_BASIC_ATOMIC_INITIALIZER(a) { (a) } -#endif +#define Q_BASIC_ATOMIC_INITIALIZER(a) { (a) } QT_END_NAMESPACE QT_END_HEADER |