Skip to content

Commit 8142de8

Browse files
authored
Replace deprecated std::result_of with std::invoke_result (#2304)
1 parent 245d728 commit 8142de8

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/carnot/udf/udtf.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ class UDTFTraits {
185185
template <class Q = TUDTF>
186186
typename std::enable_if_t<UDTFTraits<Q>::HasInitArgsFn(),
187187
bool> static constexpr HasCorrectInitArgsSignature() {
188-
return CorrectInitArgsTypeHelper<std::result_of_t<decltype (&TUDTF::InitArgs)()>>::value;
188+
return CorrectInitArgsTypeHelper<std::invoke_result_t<decltype(&TUDTF::InitArgs)>>::value;
189189
}
190190

191191
template <class Q = TUDTF>
@@ -231,7 +231,7 @@ class UDTFTraits {
231231
static constexpr bool HasCorrectOutputRelationFnSignature() {
232232
return HasOutputRelationFn() &&
233233
CorrectOutputRelationTypeHelper<
234-
std::result_of_t<decltype (&TUDTF::OutputRelation)()>>::value;
234+
std::invoke_result_t<decltype(&TUDTF::OutputRelation)>>::value;
235235
}
236236

237237
/**
@@ -244,7 +244,7 @@ class UDTFTraits {
244244
* @return
245245
*/
246246
static constexpr bool HasCorrectExectorFnReturnType() {
247-
return HasExecutorFn() && std::is_same_v<std::result_of_t<decltype (&TUDTF::Executor)()>,
247+
return HasExecutorFn() && std::is_same_v<std::invoke_result_t<decltype(&TUDTF::Executor)>,
248248
udfspb::UDTFSourceExecutor>;
249249
}
250250

src/common/base/utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ constexpr auto ArrayTransform(const std::array<T, N>& arr, F&& f) {
363363

364364
template <typename T, typename F, std::size_t N = 0>
365365
constexpr auto ArrayTransform(const std::array<T, 0>&, F&&) {
366-
return std::array<typename std::result_of_t<F&(T)>, 0>{};
366+
return std::array<typename std::invoke_result_t<F&, T>, 0>{};
367367
}
368368

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

0 commit comments

Comments
 (0)