Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/carnot/udf/udtf.h
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ class UDTFTraits {
template <class Q = TUDTF>
typename std::enable_if_t<UDTFTraits<Q>::HasInitArgsFn(),
bool> static constexpr HasCorrectInitArgsSignature() {
return CorrectInitArgsTypeHelper<std::result_of_t<decltype (&TUDTF::InitArgs)()>>::value;
return CorrectInitArgsTypeHelper<std::invoke_result_t<decltype(&TUDTF::InitArgs)>>::value;
}

template <class Q = TUDTF>
Expand Down Expand Up @@ -231,7 +231,7 @@ class UDTFTraits {
static constexpr bool HasCorrectOutputRelationFnSignature() {
return HasOutputRelationFn() &&
CorrectOutputRelationTypeHelper<
std::result_of_t<decltype (&TUDTF::OutputRelation)()>>::value;
std::invoke_result_t<decltype(&TUDTF::OutputRelation)>>::value;
}

/**
Expand All @@ -244,7 +244,7 @@ class UDTFTraits {
* @return
*/
static constexpr bool HasCorrectExectorFnReturnType() {
return HasExecutorFn() && std::is_same_v<std::result_of_t<decltype (&TUDTF::Executor)()>,
return HasExecutorFn() && std::is_same_v<std::invoke_result_t<decltype(&TUDTF::Executor)>,
udfspb::UDTFSourceExecutor>;
}

Expand Down
2 changes: 1 addition & 1 deletion src/common/base/utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ constexpr auto ArrayTransform(const std::array<T, N>& arr, F&& f) {

template <typename T, typename F, std::size_t N = 0>
constexpr auto ArrayTransform(const std::array<T, 0>&, F&&) {
return std::array<typename std::result_of_t<F&(T)>, 0>{};
return std::array<typename std::invoke_result_t<F&, T>, 0>{};
}

// Attempts to cast raw value into an enum, and returns error if the value is not valid.
Expand Down
Loading