From af7985e46cc3fd6eb01c1243c7f1f95b92ea5ddc Mon Sep 17 00:00:00 2001
From: Prateek Machiraju <prateek.machiraju@gmail.com>
Date: Thu, 2 Jun 2022 23:04:20 -0700
Subject: [PATCH] [wpiutil] Use invoke_result_t instead of result_of in
 future.h (#4293)

std::result_of is deprecated in C++17.
---
 wpiutil/src/main/native/include/wpi/future.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wpiutil/src/main/native/include/wpi/future.h b/wpiutil/src/main/native/include/wpi/future.h
index 5cb4a8d5d6..70dc60f2ab 100644
--- a/wpiutil/src/main/native/include/wpi/future.h
+++ b/wpiutil/src/main/native/include/wpi/future.h
@@ -334,7 +334,7 @@ class future final {
     }
   }
 
-  template <typename F, typename R = typename std::result_of<F && (T &&)>::type>
+  template <typename F, typename R = typename std::invoke_result_t<F&&, T&&>>
   future<R> then(F&& func) {
     return then(PromiseFactory<R>::GetInstance(), std::forward<F>(func));
   }
@@ -457,7 +457,7 @@ class future<void> final {
     }
   }
 
-  template <typename F, typename R = typename std::result_of<F && ()>::type>
+  template <typename F, typename R = typename std::invoke_result_t<F&&>>
   future<R> then(F&& func) {
     return then(PromiseFactory<R>::GetInstance(), std::forward<F>(func));
   }