From f01ec0713d994ca25b226fab5163c849e288fe87 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 10 Sep 2020 09:52:44 +0200 Subject: [PATCH] should always be available with C++17 Change-Id: Ia4868259bfa25e4b929a51de6de580df7277c282 Reviewed-by: Thiago Macieira --- src/corelib/thread/qmutex.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h index c45051d03f..7800c14ff8 100644 --- a/src/corelib/thread/qmutex.h +++ b/src/corelib/thread/qmutex.h @@ -173,7 +173,6 @@ public: return lockInternal(timeout); } -#if __has_include() || defined(Q_CLANG_QDOC) // TimedLockable concept template bool try_lock_for(std::chrono::duration duration) @@ -190,7 +189,6 @@ public: return try_lock_for(timePoint - Clock::now()); } -#endif }; class QRecursiveMutexPrivate; @@ -213,7 +211,6 @@ public: // Lockable concept bool try_lock() QT_MUTEX_LOCK_NOEXCEPT { return tryLock(); } -#if __has_include() || defined(Q_CLANG_QDOC) // TimedLockable concept template bool try_lock_for(std::chrono::duration duration) @@ -230,7 +227,6 @@ public: return try_lock_for(timePoint - Clock::now()); } -#endif }; template @@ -291,7 +287,6 @@ public: inline bool try_lock() noexcept { return true; } inline void unlock() noexcept {} -#if __has_include() template inline bool try_lock_for(std::chrono::duration duration) noexcept { @@ -305,7 +300,6 @@ public: Q_UNUSED(timePoint); return true; } -#endif private: Q_DISABLE_COPY(QMutex)