diff options
| author | Tomasz Wasilczyk <twasilczyk@google.com> | 2024-01-10 10:57:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-10 10:57:22 +0000 |
| commit | a873048cfe491bbe28f26ac9fa155afcb628ab1a (patch) | |
| tree | 168b78a2c9f09489b1d58e9b1646b60b61b5e0e6 | |
| parent | 8165be4972a1ac7a76a6ad7d509413f4ca023a43 (diff) | |
| parent | 2d1fbf685c945f8513d1dece20f3a967d766134b (diff) | |
| download | libtextclassifier-a873048cfe491bbe28f26ac9fa155afcb628ab1a.tar.gz | |
Don't use std::result_of am: 2d1fbf685c
Original change: https://android-review.googlesource.com/c/platform/external/libtextclassifier/+/2901832
Change-Id: I9940fc80a349d512720dd978c28176353ee85d1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | abseil-cpp/absl/meta/type_traits.h | 3 | ||||
| -rw-r--r-- | abseil-cpp/absl/types/compare.h | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/abseil-cpp/absl/meta/type_traits.h b/abseil-cpp/absl/meta/type_traits.h index 75689bb..39d5ed7 100644 --- a/abseil-cpp/absl/meta/type_traits.h +++ b/abseil-cpp/absl/meta/type_traits.h @@ -610,9 +610,6 @@ using common_type_t = typename std::common_type<T...>::type; template <typename T> using underlying_type_t = typename std::underlying_type<T>::type; -template <typename T> -using result_of_t = typename std::result_of<T>::type; - namespace type_traits_internal { // In MSVC we can't probe std::hash or stdext::hash because it triggers a // static_assert instead of failing substitution. Libc++ prior to 4.0 diff --git a/abseil-cpp/absl/types/compare.h b/abseil-cpp/absl/types/compare.h index 19b076e..3d6baa1 100644 --- a/abseil-cpp/absl/types/compare.h +++ b/abseil-cpp/absl/types/compare.h @@ -574,8 +574,8 @@ constexpr absl::weak_ordering compare_result_as_ordering( template < typename Compare, typename K, typename LK, - absl::enable_if_t<!std::is_same<bool, absl::result_of_t<Compare( - const K &, const LK &)>>::value, + absl::enable_if_t<!std::is_same<bool, std::invoke_result_t<Compare, + const K &, const LK &>>::value, int> = 0> constexpr absl::weak_ordering do_three_way_comparison(const Compare &compare, const K &x, const LK &y) { @@ -583,8 +583,8 @@ constexpr absl::weak_ordering do_three_way_comparison(const Compare &compare, } template < typename Compare, typename K, typename LK, - absl::enable_if_t<std::is_same<bool, absl::result_of_t<Compare( - const K &, const LK &)>>::value, + absl::enable_if_t<std::is_same<bool, std::invoke_result_t<Compare, + const K &, const LK &>>::value, int> = 0> constexpr absl::weak_ordering do_three_way_comparison(const Compare &compare, const K &x, const LK &y) { |