whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Bradley T. Hughes 2012-02-13 06:56:30 +01:00 committed by Qt by Nokia
parent df4746db04
commit 5c5498ca0d
1 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/corelib/thread/qoldbasicatomic.h
View File

@ -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