Skip to content

Replace std::result_of_t with std::invoke_result_t to fix C++20 build #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alt-graph merged 1 commit into from
Feb 17, 2026
Merged

Replace std::result_of_t with std::invoke_result_t to fix C++20 build #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions include/gul17/statistics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ class StandardDeviationMean {
template <typename ResultT = statistics_result_type,
typename ContainerT,
typename ElementT = typename ContainerT::value_type,
typename Accessor = std::result_of_t<decltype(ElementAccessor<ElementT>())(ElementT)>(*)(ElementT const&),
typename DataT = typename std::decay_t<std::result_of_t<Accessor(ElementT)>>,
typename Accessor = std::invoke_result_t<decltype(ElementAccessor<ElementT>()), ElementT>(*)(ElementT const&),
typename DataT = typename std::decay_t<std::invoke_result_t<Accessor, ElementT>>,
typename = std::enable_if_t<IsContainerLike<ContainerT>::value>
>
auto mean(ContainerT const& container, Accessor accessor = ElementAccessor<ElementT>()) -> ResultT
Expand Down Expand Up @@ -198,8 +198,8 @@ auto mean(ContainerT const& container, Accessor accessor = ElementAccessor<Eleme
template <typename ResultT = statistics_result_type,
typename ContainerT,
typename ElementT = typename ContainerT::value_type,
typename Accessor = std::result_of_t<decltype(ElementAccessor<ElementT>())(ElementT)>(*)(ElementT const&),
typename DataT = typename std::decay_t<std::result_of_t<Accessor(ElementT)>>,
typename Accessor = std::invoke_result_t<decltype(ElementAccessor<ElementT>()), ElementT>(*)(ElementT const&),
typename DataT = typename std::decay_t<std::invoke_result_t<Accessor, ElementT>>,
typename = std::enable_if_t<IsContainerLike<ContainerT>::value>
>
auto rms(ContainerT const& container, Accessor accessor = ElementAccessor<ElementT>()) -> ResultT
Expand Down Expand Up @@ -239,8 +239,8 @@ auto rms(ContainerT const& container, Accessor accessor = ElementAccessor<Elemen
template <typename ResultT = statistics_result_type,
typename ContainerT,
typename ElementT = typename ContainerT::value_type,
typename Accessor = std::result_of_t<decltype(ElementAccessor<ElementT>())(ElementT)>(*)(ElementT const&),
typename DataT = typename std::decay_t<std::result_of_t<Accessor(ElementT)>>,
typename Accessor = std::invoke_result_t<decltype(ElementAccessor<ElementT>()), ElementT>(*)(ElementT const&),
typename DataT = typename std::decay_t<std::invoke_result_t<Accessor, ElementT>>,
typename = std::enable_if_t<IsContainerLike<ContainerT>::value>
>
auto median(ContainerT const& container, Accessor accessor = ElementAccessor<ElementT>()) -> ResultT
Expand Down Expand Up @@ -307,8 +307,8 @@ auto median(ContainerT const& container, Accessor accessor = ElementAccessor<Ele
*/
template <typename ContainerT,
typename ElementT = typename ContainerT::value_type,
typename Accessor = std::result_of_t<decltype(ElementAccessor<ElementT>())(ElementT)>(*)(ElementT const&),
typename DataT = typename std::decay_t<std::result_of_t<Accessor(ElementT)>>,
typename Accessor = std::invoke_result_t<decltype(ElementAccessor<ElementT>()), ElementT>(*)(ElementT const&),
typename DataT = typename std::decay_t<std::invoke_result_t<Accessor, ElementT>>,
typename = std::enable_if_t<IsContainerLike<ContainerT>::value>
>
auto maximum(ContainerT const& container, Accessor accessor = ElementAccessor<ElementT>()) -> DataT
Expand Down Expand Up @@ -361,8 +361,8 @@ auto maximum(ContainerT const& container, Accessor accessor = ElementAccessor<El
*/
template <typename ContainerT,
typename ElementT = typename ContainerT::value_type,
typename Accessor = std::result_of_t<decltype(ElementAccessor<ElementT>())(ElementT)>(*)(ElementT const&),
typename DataT = typename std::decay_t<std::result_of_t<Accessor(ElementT)>>,
typename Accessor = std::invoke_result_t<decltype(ElementAccessor<ElementT>()), ElementT>(*)(ElementT const&),
typename DataT = typename std::decay_t<std::invoke_result_t<Accessor, ElementT>>,
typename = std::enable_if_t<IsContainerLike<ContainerT>::value>
>
auto minimum(ContainerT const& container, Accessor accessor = ElementAccessor<ElementT>()) -> DataT
Expand Down Expand Up @@ -420,8 +420,8 @@ auto minimum(ContainerT const& container, Accessor accessor = ElementAccessor<El
*/
template <typename ContainerT,
typename ElementT = typename ContainerT::value_type,
typename Accessor = std::result_of_t<decltype(ElementAccessor<ElementT>())(ElementT)>(*)(ElementT const&),
typename DataT = typename std::decay_t<std::result_of_t<Accessor(ElementT)>>,
typename Accessor = std::invoke_result_t<decltype(ElementAccessor<ElementT>()), ElementT>(*)(ElementT const&),
typename DataT = typename std::decay_t<std::invoke_result_t<Accessor, ElementT>>,
typename = std::enable_if_t<IsContainerLike<ContainerT>::value>
>
auto min_max(ContainerT const& container, Accessor accessor = ElementAccessor<ElementT>()) -> MinMax<DataT>
Expand Down Expand Up @@ -468,8 +468,8 @@ auto min_max(ContainerT const& container, Accessor accessor = ElementAccessor<El
*/
template <typename ContainerT,
typename ElementT = typename ContainerT::value_type,
typename Accessor = std::result_of_t<decltype(ElementAccessor<ElementT>())(ElementT)>(*)(ElementT const&),
typename DataT = typename std::decay_t<std::result_of_t<Accessor(ElementT)>>,
typename Accessor = std::invoke_result_t<decltype(ElementAccessor<ElementT>()), ElementT>(*)(ElementT const&),
typename DataT = typename std::decay_t<std::invoke_result_t<Accessor, ElementT>>,
typename = std::enable_if_t<IsContainerLike<ContainerT>::value>
>
auto remove_outliers(ContainerT&& cont, std::size_t outliers,
Expand All @@ -492,8 +492,8 @@ auto remove_outliers(ContainerT&& cont, std::size_t outliers,
*/
template <typename ContainerT,
typename ElementT = typename ContainerT::value_type,
typename Accessor = std::result_of_t<decltype(ElementAccessor<ElementT>())(ElementT)>(*)(ElementT const&),
typename DataT = typename std::decay_t<std::result_of_t<Accessor(ElementT)>>,
typename Accessor = std::invoke_result_t<decltype(ElementAccessor<ElementT>()), ElementT>(*)(ElementT const&),
typename DataT = typename std::decay_t<std::invoke_result_t<Accessor, ElementT>>,
typename = std::enable_if_t<IsContainerLike<ContainerT>::value>
>
auto remove_outliers(ContainerT const& cont, std::size_t outliers,
Expand Down Expand Up @@ -545,8 +545,8 @@ auto remove_outliers(ContainerT const& cont, std::size_t outliers,
template <typename ResultT = statistics_result_type,
typename ContainerT,
typename ElementT = typename ContainerT::value_type,
typename Accessor = std::result_of_t<decltype(ElementAccessor<ElementT>())(ElementT)>(*)(ElementT const&),
typename DataT = typename std::decay_t<std::result_of_t<Accessor(ElementT)>>,
typename Accessor = std::invoke_result_t<decltype(ElementAccessor<ElementT>()), ElementT>(*)(ElementT const&),
typename DataT = typename std::decay_t<std::invoke_result_t<Accessor, ElementT>>,
typename = std::enable_if_t<IsContainerLike<ContainerT>::value>
>
auto standard_deviation(ContainerT const& container, Accessor accessor = ElementAccessor<ElementT>()) -> StandardDeviationMean<ResultT>
Expand Down Expand Up @@ -598,8 +598,8 @@ auto standard_deviation(ContainerT const& container, Accessor accessor = Element
template <typename ResultT = statistics_result_type,
typename ContainerT,
typename ElementT = typename ContainerT::value_type,
typename Accessor = std::result_of_t<decltype(ElementAccessor<ElementT>())(ElementT)>(*)(ElementT const&),
typename DataT = typename std::decay_t<std::result_of_t<Accessor(ElementT)>>,
typename Accessor = std::invoke_result_t<decltype(ElementAccessor<ElementT>()), ElementT>(*)(ElementT const&),
typename DataT = typename std::decay_t<std::invoke_result_t<Accessor, ElementT>>,
typename OpClosure,
typename = std::enable_if_t<IsContainerLike<ContainerT>::value>
>
Expand Down Expand Up @@ -666,8 +666,8 @@ namespace {
template <typename ResultT = statistics_result_type,
typename IteratorT,
typename ElementT = std::decay_t<decltype(*std::declval<IteratorT>())>,
typename Accessor = std::result_of_t<decltype(ElementAccessor<ElementT>())(ElementT)>(*)(ElementT const&),
typename DataT = std::decay_t<std::result_of_t<Accessor(ElementT)>>>
typename Accessor = std::invoke_result_t<decltype(ElementAccessor<ElementT>()), ElementT>(*)(ElementT const&),
typename DataT = std::decay_t<std::invoke_result_t<Accessor, ElementT>>>
auto mean(IteratorT const& begin, IteratorT const& end,
Accessor accessor = ElementAccessor<ElementT>()) -> ResultT
{
Expand All @@ -686,8 +686,8 @@ auto mean(IteratorT const& begin, IteratorT const& end,
template <typename ResultT = statistics_result_type,
typename IteratorT,
typename ElementT = std::decay_t<decltype(*std::declval<IteratorT>())>,
typename Accessor = std::result_of_t<decltype(ElementAccessor<ElementT>())(ElementT)>(*)(ElementT const&),
typename DataT = std::decay_t<std::result_of_t<Accessor(ElementT)>>>
typename Accessor = std::invoke_result_t<decltype(ElementAccessor<ElementT>()), ElementT>(*)(ElementT const&),
typename DataT = std::decay_t<std::invoke_result_t<Accessor, ElementT>>>
auto rms(IteratorT const& begin, IteratorT const& end,
Accessor accessor = ElementAccessor<ElementT>()) -> ResultT
{
Expand All @@ -706,8 +706,8 @@ auto rms(IteratorT const& begin, IteratorT const& end,
template <typename ResultT = statistics_result_type,
typename IteratorT,
typename ElementT = std::decay_t<decltype(*std::declval<IteratorT>())>,
typename Accessor = std::result_of_t<decltype(ElementAccessor<ElementT>())(ElementT)>(*)(ElementT const&),
typename DataT = std::decay_t<std::result_of_t<Accessor(ElementT)>>>
typename Accessor = std::invoke_result_t<decltype(ElementAccessor<ElementT>()), ElementT>(*)(ElementT const&),
typename DataT = std::decay_t<std::invoke_result_t<Accessor, ElementT>>>
auto median(IteratorT const& begin, IteratorT const& end,
Accessor accessor = ElementAccessor<ElementT>()) -> ResultT
{
Expand All @@ -725,8 +725,8 @@ auto median(IteratorT const& begin, IteratorT const& end,
*/
template <typename IteratorT,
typename ElementT = std::decay_t<decltype(*std::declval<IteratorT>())>,
typename Accessor = std::result_of_t<decltype(ElementAccessor<ElementT>())(ElementT)>(*)(ElementT const&),
typename DataT = std::decay_t<std::result_of_t<Accessor(ElementT)>>>
typename Accessor = std::invoke_result_t<decltype(ElementAccessor<ElementT>()), ElementT>(*)(ElementT const&),
typename DataT = std::decay_t<std::invoke_result_t<Accessor, ElementT>>>
auto maximum(IteratorT const& begin, IteratorT const& end,
Accessor accessor = ElementAccessor<ElementT>()) -> DataT
{
Expand All @@ -744,8 +744,8 @@ template <typename IteratorT,
*/
template <typename IteratorT,
typename ElementT = std::decay_t<decltype(*std::declval<IteratorT>())>,
typename Accessor = std::result_of_t<decltype(ElementAccessor<ElementT>())(ElementT)>(*)(ElementT const&),
typename DataT = std::decay_t<std::result_of_t<Accessor(ElementT)>>>
typename Accessor = std::invoke_result_t<decltype(ElementAccessor<ElementT>()), ElementT>(*)(ElementT const&),
typename DataT = std::decay_t<std::invoke_result_t<Accessor, ElementT>>>
auto minimum(IteratorT const& begin, IteratorT const& end,
Accessor accessor = ElementAccessor<ElementT>()) -> DataT
{
Expand All @@ -763,8 +763,8 @@ template <typename IteratorT,
*/
template <typename IteratorT,
typename ElementT = std::decay_t<decltype(*std::declval<IteratorT>())>,
typename Accessor = std::result_of_t<decltype(ElementAccessor<ElementT>())(ElementT)>(*)(ElementT const&),
typename DataT = std::decay_t<std::result_of_t<Accessor(ElementT)>>>
typename Accessor = std::invoke_result_t<decltype(ElementAccessor<ElementT>()), ElementT>(*)(ElementT const&),
typename DataT = std::decay_t<std::invoke_result_t<Accessor, ElementT>>>
auto min_max(IteratorT const& begin, IteratorT const& end,
Accessor accessor = ElementAccessor<ElementT>()) -> MinMax<DataT>
{
Expand All @@ -784,8 +784,8 @@ auto min_max(IteratorT const& begin, IteratorT const& end,
*/
template <typename IteratorT,
typename ElementT = std::decay_t<decltype(*std::declval<IteratorT>())>,
typename Accessor = std::result_of_t<decltype(ElementAccessor<ElementT>())(ElementT)>(*)(ElementT const&),
typename DataT = std::decay_t<std::result_of_t<Accessor(ElementT)>>>
typename Accessor = std::invoke_result_t<decltype(ElementAccessor<ElementT>()), ElementT>(*)(ElementT const&),
typename DataT = std::decay_t<std::invoke_result_t<Accessor, ElementT>>>
auto remove_outliers(IteratorT const& begin, IteratorT const& end,
std::size_t outliers, Accessor accessor = ElementAccessor<ElementT>()) -> std::vector<ElementT>
{
Expand All @@ -805,8 +805,8 @@ auto remove_outliers(IteratorT const& begin, IteratorT const& end,
template <typename ResultT = statistics_result_type,
typename IteratorT,
typename ElementT = std::decay_t<decltype(*std::declval<IteratorT>())>,
typename Accessor = std::result_of_t<decltype(ElementAccessor<ElementT>())(ElementT)>(*)(ElementT const&),
typename DataT = std::decay_t<std::result_of_t<Accessor(ElementT)>>>
typename Accessor = std::invoke_result_t<decltype(ElementAccessor<ElementT>()), ElementT>(*)(ElementT const&),
typename DataT = std::decay_t<std::invoke_result_t<Accessor, ElementT>>>
auto standard_deviation(IteratorT const& begin, IteratorT const& end,
Accessor accessor = ElementAccessor<ElementT>()) -> StandardDeviationMean<ResultT>
{
Expand All @@ -827,8 +827,8 @@ auto standard_deviation(IteratorT const& begin, IteratorT const& end,
template <typename ResultT = statistics_result_type,
typename IteratorT,
typename ElementT = std::decay_t<decltype(*std::declval<IteratorT>())>,
typename Accessor = std::result_of_t<decltype(ElementAccessor<ElementT>())(ElementT)>(*)(ElementT const&),
typename DataT = std::decay_t<std::result_of_t<Accessor(ElementT)>>,
typename Accessor = std::invoke_result_t<decltype(ElementAccessor<ElementT>()), ElementT>(*)(ElementT const&),
typename DataT = std::decay_t<std::invoke_result_t<Accessor, ElementT>>,
typename OpClosure>
auto accumulate(IteratorT const& begin, IteratorT const& end, OpClosure op,
Accessor accessor = ElementAccessor<ElementT>()) -> ResultT
Expand Down
Loading