diff --git a/src/libs/utils/functiontraits.h b/src/libs/utils/functiontraits.h index 2544b525d91..4c172eefba3 100644 --- a/src/libs/utils/functiontraits.h +++ b/src/libs/utils/functiontraits.h @@ -155,6 +155,9 @@ struct functionTraits : public functionTraits { }; +template +using functionResult_t = typename functionTraits::ResultType; + //////////////////// // functionTakesArgument //////////////////// diff --git a/src/libs/utils/mapreduce.h b/src/libs/utils/mapreduce.h index 007056ecc81..828b16b31f9 100644 --- a/src/libs/utils/mapreduce.h +++ b/src/libs/utils/mapreduce.h @@ -243,7 +243,7 @@ protected: }; template -typename functionTraits::ResultType +functionResult_t callWithMaybeFutureInterfaceDispatch(std::false_type, QFutureInterface &, Function &&function, Args&&... args) { @@ -251,7 +251,7 @@ callWithMaybeFutureInterfaceDispatch(std::false_type, QFutureInterface -typename functionTraits::ResultType +functionResult_t callWithMaybeFutureInterfaceDispatch(std::true_type, QFutureInterface &futureInterface, Function &&function, Args&&... args) { @@ -259,7 +259,7 @@ callWithMaybeFutureInterfaceDispatch(std::true_type, QFutureInterface -typename functionTraits::ResultType +functionResult_t callWithMaybeFutureInterface(QFutureInterface &futureInterface, Function &&function, Args&&... args) { diff --git a/src/libs/utils/runextensions.h b/src/libs/utils/runextensions.h index e08cc02bd6f..43a25411d6e 100644 --- a/src/libs/utils/runextensions.h +++ b/src/libs/utils/runextensions.h @@ -98,7 +98,7 @@ struct resultTypeWithArgument&> template struct resultTypeWithArgument { - using type = typename functionTraits::ResultType; + using type = functionResult_t; }; template @@ -110,7 +110,7 @@ struct resultTypeTakesArguments template struct resultTypeTakesArguments { - using type = typename functionTraits::ResultType; + using type = functionResult_t; }; template