From 082c006c04343a78d87b6c6ab3608c25d6213c3f Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 21 Nov 2020 14:43:54 +0100 Subject: merge(3p/absl): subtree merge of Abseil up to e19260f ... notably, this includes Abseil's own StatusOr type, which conflicted with our implementation (that was taken from TensorFlow). Change-Id: Ie7d6764b64055caaeb8dc7b6b9d066291e6b538f --- third_party/abseil_cpp/absl/utility/utility.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'third_party/abseil_cpp/absl/utility/utility.h') diff --git a/third_party/abseil_cpp/absl/utility/utility.h b/third_party/abseil_cpp/absl/utility/utility.h index e6647c7b2e61..bf9232209a9b 100644 --- a/third_party/abseil_cpp/absl/utility/utility.h +++ b/third_party/abseil_cpp/absl/utility/utility.h @@ -236,10 +236,10 @@ namespace utility_internal { // Helper method for expanding tuple into a called method. template auto apply_helper(Functor&& functor, Tuple&& t, index_sequence) - -> decltype(absl::base_internal::Invoke( + -> decltype(absl::base_internal::invoke( absl::forward(functor), std::get(absl::forward(t))...)) { - return absl::base_internal::Invoke( + return absl::base_internal::invoke( absl::forward(functor), std::get(absl::forward(t))...); } -- cgit 1.4.1