From b9cccf7b0de30bce2407278276bda5bda5c9da93 Mon Sep 17 00:00:00 2001
From: Dom Del Nano <ddelnano@gmail.com>
Date: Fri, 19 Dec 2025 16:34:13 +0000
Subject: [PATCH 1/2] Replace deprecated std::result_of with std::invoke_result

Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
---
 src/carnot/udf/udtf.h   | 6 +++---
 src/common/base/utils.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/carnot/udf/udtf.h b/src/carnot/udf/udtf.h
index 3fe5c4d296a..c16813c1b22 100644
--- a/src/carnot/udf/udtf.h
+++ b/src/carnot/udf/udtf.h
@@ -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>
@@ -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;
   }
 
   /**
@@ -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>;
   }
 
diff --git a/src/common/base/utils.h b/src/common/base/utils.h
index 9a7b889b48b..675c50e51a0 100644
--- a/src/common/base/utils.h
+++ b/src/common/base/utils.h
@@ -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.

From dcfa0bface6b22e57d4b1d9677d139e32ba6c1fd Mon Sep 17 00:00:00 2001
From: Dom Del Nano <ddelnano@gmail.com>
Date: Fri, 19 Dec 2025 16:40:21 +0000
Subject: [PATCH 2/2] Fix linting

Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
---
 src/carnot/udf/udtf.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/carnot/udf/udtf.h b/src/carnot/udf/udtf.h
index c16813c1b22..4f05dfacd4e 100644
--- a/src/carnot/udf/udtf.h
+++ b/src/carnot/udf/udtf.h
@@ -231,7 +231,7 @@ class UDTFTraits {
   static constexpr bool HasCorrectOutputRelationFnSignature() {
     return HasOutputRelationFn() &&
            CorrectOutputRelationTypeHelper<
-               std::invoke_result_t<decltype (&TUDTF::OutputRelation)>>::value;
+               std::invoke_result_t<decltype(&TUDTF::OutputRelation)>>::value;
   }
 
   /**
@@ -244,7 +244,7 @@ class UDTFTraits {
    * @return
    */
   static constexpr bool HasCorrectExectorFnReturnType() {
-    return HasExecutorFn() && std::is_same_v<std::invoke_result_t<decltype (&TUDTF::Executor)>,
+    return HasExecutorFn() && std::is_same_v<std::invoke_result_t<decltype(&TUDTF::Executor)>,
                                              udfspb::UDTFSourceExecutor>;
   }