diff options
Diffstat (limited to 'src/concurrent/qtconcurrentfunctionwrappers.h')
| -rw-r--r-- | src/concurrent/qtconcurrentfunctionwrappers.h | 85 |
1 files changed, 22 insertions, 63 deletions
diff --git a/src/concurrent/qtconcurrentfunctionwrappers.h b/src/concurrent/qtconcurrentfunctionwrappers.h index be4a09f107..78900c239b 100644 --- a/src/concurrent/qtconcurrentfunctionwrappers.h +++ b/src/concurrent/qtconcurrentfunctionwrappers.h @@ -1,51 +1,16 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtConcurrent module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTCONCURRENT_FUNCTIONWRAPPERS_H #define QTCONCURRENT_FUNCTIONWRAPPERS_H #include <QtConcurrent/qtconcurrentcompilertest.h> +#include <QtConcurrent/qtconcurrentreducekernel.h> #include <QtCore/qfuture.h> #include <tuple> -#if !defined(QT_NO_CONCURRENT) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_CONCURRENT) || defined(Q_QDOC) QT_BEGIN_NAMESPACE @@ -129,7 +94,6 @@ struct ReduceResultType<R(*)(A...)> using ResultType = typename std::tuple_element<0, std::tuple<A...>>::type; }; -#if defined(__cpp_noexcept_function_type) && __cpp_noexcept_function_type >= 201510 template <class U, class V> struct ReduceResultType<void(*)(U&,V) noexcept> { @@ -141,31 +105,28 @@ struct ReduceResultType<T(C::*)(U) noexcept> { using ResultType = C; }; -#endif template<class T, class Enable = void> -struct hasCallOperator : std::false_type -{ -}; +inline constexpr bool hasCallOperator_v = false; template<class T> -struct hasCallOperator<T, std::void_t<decltype(&T::operator())>> : std::true_type -{ -}; +inline constexpr bool hasCallOperator_v<T, std::void_t<decltype(&T::operator())>> = true; template<class T, class Enable = void> -struct isIterator : std::false_type -{ -}; +inline constexpr bool isIterator_v = false; template<class T> -struct isIterator<T, std::void_t<typename std::iterator_traits<T>::value_type>> : std::true_type -{ -}; +inline constexpr bool isIterator_v<T, std::void_t<typename std::iterator_traits<T>::value_type>> = + true; template <class Callable, class Sequence> using isInvocable = std::is_invocable<Callable, typename std::decay_t<Sequence>::value_type>; +template <class InitialValueType, class ResultType> +inline constexpr bool isInitialValueCompatible_v = std::conjunction_v< + std::is_convertible<InitialValueType, ResultType>, + std::negation<std::is_same<std::decay_t<InitialValueType>, QtConcurrent::ReduceOption>>>; + template<class Callable, class Enable = void> struct ReduceResultTypeHelper { @@ -182,7 +143,7 @@ struct ReduceResultTypeHelper<Callable, template <class Callable> struct ReduceResultTypeHelper<Callable, typename std::enable_if_t<!std::is_function_v<std::remove_pointer_t<std::decay_t<Callable>>> - && hasCallOperator<std::decay_t<Callable>>::value>> + && hasCallOperator_v<std::decay_t<Callable>>>> { using type = std::decay_t<typename QtPrivate::ArgResolver<Callable>::First>; }; @@ -190,7 +151,13 @@ struct ReduceResultTypeHelper<Callable, // -- MapSequenceResultType template <class InputSequence, class MapFunctor> -struct MapSequenceResultType; +struct MapSequenceResultType +{ + static_assert(std::is_same_v<typename InputSequence::value_type, + QtPrivate::MapResultType<InputSequence, MapFunctor>>, + "Couldn't deduce the output sequence type, you must specify it explicitly."); + typedef InputSequence ResultType; +}; #ifndef QT_NO_TEMPLATE_TEMPLATE_PARAMETERS @@ -202,14 +169,6 @@ struct MapSequenceResultType<InputSequence<T...>, MapFunctor> #endif // QT_NO_TEMPLATE_TEMPLATE_PARAMETER -template<typename Sequence> -struct SequenceHolder -{ - SequenceHolder(const Sequence &s) : sequence(s) { } - SequenceHolder(Sequence &&s) : sequence(std::move(s)) { } - Sequence sequence; -}; - } // namespace QtPrivate. |