diff options
Diffstat (limited to 'src/corelib/thread/qfuture.h')
| -rw-r--r-- | src/corelib/thread/qfuture.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/thread/qfuture.h b/src/corelib/thread/qfuture.h index fdecae0e084..e09d9a43a8f 100644 --- a/src/corelib/thread/qfuture.h +++ b/src/corelib/thread/qfuture.h @@ -25,7 +25,7 @@ template <typename T> class QFuture { static_assert (std::is_move_constructible_v<T> - || std::is_same_v<T, void>, + || std::is_void_v<T>, "A move-constructible type or type void is required"); public: QFuture() @@ -167,7 +167,7 @@ QT_WARNING_POP class const_iterator { public: - static_assert(!std::is_same_v<T, void>, + static_assert(!std::is_void_v<T>, "It isn't possible to define QFuture<void>::const_iterator"); typedef std::bidirectional_iterator_tag iterator_category; @@ -297,7 +297,7 @@ private: friend struct QtPrivate::UnwrapHandler; using QFuturePrivate = - std::conditional_t<std::is_same_v<T, void>, QFutureInterfaceBase, QFutureInterface<T>>; + std::conditional_t<std::is_void_v<T>, QFutureInterfaceBase, QFutureInterface<T>>; #ifdef QFUTURE_TEST public: @@ -438,7 +438,7 @@ template<typename T> struct MetaTypeQFutureHelper<QFuture<T>> { static bool registerConverter() { - if constexpr (std::is_same_v<T, void>) { + if constexpr (std::is_void_v<T>) { return false; } else { return QMetaType::registerConverter<QFuture<T>, QFuture<void>>( |