summaryrefslogtreecommitdiffstats
path: root/src/corelib/thread/qoldbasicatomic.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago@kde.org>2011-07-31 18:25:24 -0300
committerQt by Nokia <qt-info@nokia.com>2012-01-24 01:08:24 +0100
commit161d5eb3239b52e6f19942721491f2632305e426 (patch)
tree5d3594cb27c8c291d5a0eaef16eaef16b4b3e79d /src/corelib/thread/qoldbasicatomic.h
parent1831abb5bbcb520ffcb329fa67bf4d4405eb2ab4 (diff)
Port the bootstrap atomics to the new QBasicAtomic architecture
The code is now much simpler and much more complete. Now the bootstrap atomics (which aren't atomic at all) contain the full set of operations. The only integer supported is int, but all others would work too. Change-Id: Id99f07818f9da059c4ff02520f9cbf2d1a71a514 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/thread/qoldbasicatomic.h')
-rw-r--r--src/corelib/thread/qoldbasicatomic.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/thread/qoldbasicatomic.h b/src/corelib/thread/qoldbasicatomic.h
index 0842bf5f4c..96feb2e491 100644
--- a/src/corelib/thread/qoldbasicatomic.h
+++ b/src/corelib/thread/qoldbasicatomic.h
@@ -171,10 +171,6 @@ public:
QT_END_NAMESPACE
QT_END_HEADER
-#if defined(QT_MOC) || defined(QT_BUILD_QMAKE) || defined(QT_RCC) || defined(QT_UIC) || defined(QT_BOOTSTRAPPED)
-# include <QtCore/qatomic_bootstrap.h>
-#else
# include <QtCore/qatomic_arch.h>
-#endif
#endif // QBASIC_ATOMIC