From 116231387eec9d71e9bf292886f6b51a5f78b867 Mon Sep 17 00:00:00 2001
From: Ryan Prichard <rprichard@google.com>
Date: Sat, 6 Apr 2024 01:29:14 -0700
Subject: Remove use of std::iterator and std::result_of

std::iterator was deprecated in C++17. std::result_of was removed in
C++20.

Bug: 333165689
Test: art_standalone_libartbase_tests
Change-Id: Id60f82a0368062416663a20d0b8e9a109fdac9cc
---
 runtime/native/dalvik_system_VMStack.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'runtime/native/dalvik_system_VMStack.cc')

diff --git a/runtime/native/dalvik_system_VMStack.cc b/runtime/native/dalvik_system_VMStack.cc
index 599bdb9e4b..366059bd17 100644
--- a/runtime/native/dalvik_system_VMStack.cc
+++ b/runtime/native/dalvik_system_VMStack.cc
@@ -36,10 +36,8 @@ namespace art HIDDEN {
 
 template <typename T,
           typename ResultT =
-              typename std::result_of<T(Thread*, const ScopedFastNativeObjectAccess&)>::type>
-static ResultT GetThreadStack(const ScopedFastNativeObjectAccess& soa,
-                              jobject peer,
-                              T fn)
+              typename std::invoke_result_t<T, Thread*, const ScopedFastNativeObjectAccess&>>
+static ResultT GetThreadStack(const ScopedFastNativeObjectAccess& soa, jobject peer, T fn)
     REQUIRES_SHARED(Locks::mutator_lock_) {
   ResultT trace = nullptr;
   ObjPtr<mirror::Object> decoded_peer = soa.Decode<mirror::Object>(peer);
-- 
cgit v1.2.3-59-g8ed1b