Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79d81018 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't use std::result_of" into main am: 14b243b1 am: 3fa708af 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2903185



Change-Id: I52ec0e3e7987fdc09518524c29f0404f613ef92a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f52161e6 3fa708af

cmds/idlcli/vibrator.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ inline auto getService<android::hardware::vibrator::V1_3::IVibrator>(std::string 
}



template <typename I>

using shared_ptr = std::result_of_t<decltype(getService<I>)&(std::string)>;

using shared_ptr = std::invoke_result_t<decltype(getService<I>)&, std::string>;



template <typename I>

class HalWrapper {

cmds/lshal/Timeout.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ namespace lshal { 
// has returned, especially if deadline has been reached. Hence, care must be taken when passing

// data between the background thread and the main thread. See b/311143089.

template<class R, class P, class Function, class I, class... Args>

typename std::result_of<Function(I *, Args...)>::type

typename std::invoke_result<Function, I *, Args...>::type

timeoutIPC(std::chrono::duration<R, P> wait, const sp<I> &interfaceObject, Function &&func,

           Args &&... args) {

    using ::android::hardware::Status;