diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-09-10 09:52:44 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-10-17 12:03:05 +0200 |
| commit | f01ec0713d994ca25b226fab5163c849e288fe87 (patch) | |
| tree | 5233453a755bbfddeaff47fa06ba9eb036f774e7 /src | |
| parent | d4b206b246caf9b49110526585693ab629609d99 (diff) | |
<chrono> should always be available with C++17
Change-Id: Ia4868259bfa25e4b929a51de6de580df7277c282
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/thread/qmutex.h | 6 |
1 files changed, 0 insertions, 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(<chrono>) || defined(Q_CLANG_QDOC) // TimedLockable concept template <class Rep, class Period> bool try_lock_for(std::chrono::duration<Rep, Period> 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(<chrono>) || defined(Q_CLANG_QDOC) // TimedLockable concept template <class Rep, class Period> bool try_lock_for(std::chrono::duration<Rep, Period> duration) @@ -230,7 +227,6 @@ public: return try_lock_for(timePoint - Clock::now()); } -#endif }; template <typename Mutex> @@ -291,7 +287,6 @@ public: inline bool try_lock() noexcept { return true; } inline void unlock() noexcept {} -#if __has_include(<chrono>) template <class Rep, class Period> inline bool try_lock_for(std::chrono::duration<Rep, Period> duration) noexcept { @@ -305,7 +300,6 @@ public: Q_UNUSED(timePoint); return true; } -#endif private: Q_DISABLE_COPY(QMutex) |