summaryrefslogtreecommitdiffstats
path: root/src/corelib/thread/qsemaphore.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2023-06-08 07:27:50 -0700
committerThiago Macieira <thiago.macieira@intel.com>2023-06-12 14:38:11 -0700
commit1a619ccb246a647e3c689d0924fe105078658033 (patch)
tree33e503f8ab3f8b5bf30e4154d481576b826e6b53 /src/corelib/thread/qsemaphore.cpp
parentb908c5cf28923a3ae2d9262361a9810bc57cc9c7 (diff)
QtCore: Remove std::mutex and std::condition_variable fallbacks
They existed because INTEGRITY hadn't yet been updated to the C++11 Standard Library, with a minor for broken MinGW cross-compilation builds that forgot to enable gthreads support in libstdc++. The former appears to have been since fixed and the latter is a massive toolchain configuration mistake. Change-Id: I63b988479db546dabffcfffd1766b55132371f9b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/corelib/thread/qsemaphore.cpp')
-rw-r--r--src/corelib/thread/qsemaphore.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/thread/qsemaphore.cpp b/src/corelib/thread/qsemaphore.cpp
index 4915bde25a..cc68c2b0cb 100644
--- a/src/corelib/thread/qsemaphore.cpp
+++ b/src/corelib/thread/qsemaphore.cpp
@@ -255,15 +255,15 @@ namespace { namespace QtSemaphorePrivate {
using namespace QtPrivate;
struct Layout1
{
- alignas(IdealMutexAlignment) QtPrivate::mutex mutex;
+ alignas(IdealMutexAlignment) std::mutex mutex;
qsizetype avail = 0;
- alignas(IdealMutexAlignment) QtPrivate::condition_variable cond;
+ alignas(IdealMutexAlignment) std::condition_variable cond;
};
struct Layout2
{
- alignas(IdealMutexAlignment) QtPrivate::mutex mutex;
- alignas(IdealMutexAlignment) QtPrivate::condition_variable cond;
+ alignas(IdealMutexAlignment) std::mutex mutex;
+ alignas(IdealMutexAlignment) std::condition_variable cond;
qsizetype avail = 0;
};