diff options
Diffstat (limited to 'runtime/native/dalvik_system_VMStack.cc')
| -rw-r--r-- | runtime/native/dalvik_system_VMStack.cc | 6 |
1 files changed, 2 insertions, 4 deletions
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); |