summaryrefslogtreecommitdiffstats
path: root/src/corelib/thread/qbasicatomic.h
diff options
context:
space:
mode:
authorFabian Kosmale <fabian.kosmale@qt.io>2022-09-17 22:51:10 +0200
committerFabian Kosmale <fabian.kosmale@qt.io>2022-09-28 01:23:31 +0200
commitc5b816393d1ea88f047ae05568786d54b5bd5f56 (patch)
treeb94fcaaa7b8a3de4ebd2d3017cdba1f083d3709c /src/corelib/thread/qbasicatomic.h
parent7d7d4671bd641634bd7ab8fd523ca96f7cda95ee (diff)
Get rid of bootstrapped atomics
C++11 atomics should be available everywhere, even it bootstrapped builds. This will allow further simplificattions. Task-number: QTBUG-103847 Change-Id: Ic8aaec5667ef7616a6aa1f0dfc2f64d327308501 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/thread/qbasicatomic.h')
-rw-r--r--src/corelib/thread/qbasicatomic.h14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h
index 714ffc55af..6a33a1fb26 100644
--- a/src/corelib/thread/qbasicatomic.h
+++ b/src/corelib/thread/qbasicatomic.h
@@ -7,19 +7,7 @@
#ifndef QBASICATOMIC_H
#define QBASICATOMIC_H
-#if defined(QT_BOOTSTRAPPED)
-# include <QtCore/qatomic_bootstrap.h>
-
-// If C++11 atomics are supported, use them!
-// Note that constexpr support is sometimes disabled in QNX or INTEGRITY builds,
-// but their libraries have <atomic>.
-#elif defined(Q_COMPILER_ATOMICS)
-# include <QtCore/qatomic_cxx11.h>
-
-// No fallback
-#else
-# error "Qt requires C++11 support"
-#endif
+#include <QtCore/qatomic_cxx11.h>
QT_WARNING_PUSH
QT_WARNING_DISABLE_MSVC(4522)