commit dcaec67bb93e6cb9adfb7fdc22130bac9e2f731b
author Ryan Prichard <rprichard@google.com> Mon Aug 29 23:11:53 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 29 23:11:53 2022 +0000
tree 0fe4a3434598059af10e20146dca913ad19f2d59
parent fdfaa30146acd399e9e69d9f1a3d0b1994e36d40
parent 8cbe32c50196e52b8b4178e7868542dcdcd6f4cc

Merge "Switch from std::result_of to std::invoke_result"

staticlibs/netd/libnetdutils/Syscalls.cpp

diff --git a/staticlibs/netd/libnetdutils/Syscalls.cpp b/staticlibs/netd/libnetdutils/Syscalls.cpp
index 9f653f7..7e1a242 100644
--- a/staticlibs/netd/libnetdutils/Syscalls.cpp
+++ b/staticlibs/netd/libnetdutils/Syscalls.cpp
@@ -26,7 +26,7 @@
 
 // Retry syscall fn as long as it returns -1 with errno == EINTR
 template <typename FnT, typename... Params>
-typename std::result_of<FnT(Params...)>::type syscallRetry(FnT fn, Params&&... params) {
+typename std::invoke_result<FnT, Params...>::type syscallRetry(FnT fn, Params&&... params) {
     auto rv = fn(std::forward<Params>(params)...);
     while ((rv == -1) && (errno == EINTR)) {
         rv = fn(std::forward<Params>(params)...);