diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-29 00:07:06 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-29 00:07:06 +0000 |
| commit | 9b026e649bf0431a0f0e090ca8521b372d9877ee (patch) | |
| tree | 9ec3cfde551cd73d089cb70c79ff0674df76c42d | |
| parent | d9a593b27fc1dfa686efe61eccb368ac989cceb5 (diff) | |
| parent | 7f6d4fd5f753e185622af658e21a7d42652bb312 (diff) | |
| download | grpc-grpc-android14-qpr3-s2-release.tar.gz | |
Snap for 11510485 from 7f6d4fd5f753e185622af658e21a7d42652bb312 to 24Q2-releaseandroid-14.0.0_r54android-14.0.0_r53android-14.0.0_r52android-14.0.0_r51android-14.0.0_r50android14-qpr3-s2-releaseandroid14-qpr3-release
Change-Id: I3593c91e8aff341bf91dc0865ffab63e469b1916
| -rw-r--r-- | src/core/lib/promise/detail/promise_like.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/core/lib/promise/detail/promise_like.h b/src/core/lib/promise/detail/promise_like.h index 395c325873..70be971cc6 100644 --- a/src/core/lib/promise/detail/promise_like.h +++ b/src/core/lib/promise/detail/promise_like.h @@ -69,9 +69,16 @@ class PromiseLike; template <> class PromiseLike<void>; +// Android local modification: Android builds grpc with C++20, which removes +// std::result_of. Use std::invoke_result_t instead. template <typename F> class PromiseLike<F, absl::enable_if_t<!std::is_void< - typename std::result_of<F()>::type>::value>> { +#if __cplusplus >= 201703L + std::invoke_result_t<F> +#else + typename std::result_of<F()>::type +#endif + >::value>> { private: GPR_NO_UNIQUE_ADDRESS F f_; |