From c1cbb05bdabcade705788a2920070c81c377dbf2 Mon Sep 17 00:00:00 2001 From: Jacob Bower Date: Mon, 13 May 2024 14:43:09 -0700 Subject: [PATCH] Apply various codemods from fbcode to Cinder repo Summary: doeswhatitsaysonthetin Reviewed By: brittanyrey Differential Revision: D57296741 fbshipit-source-id: 5a8f602ea216c91eb9933cd338708890e3609632 --- .../googletest-1.8.1/googlemock/include/gmock/gmock-actions.h | 2 +- .../ThirdParty/parallel-hashmap/parallel_hashmap/phmap_base.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cinderx/ThirdParty/googletest-1.8.1/googlemock/include/gmock/gmock-actions.h b/cinderx/ThirdParty/googletest-1.8.1/googlemock/include/gmock/gmock-actions.h index 37727c09713..b086f1f011b 100644 --- a/cinderx/ThirdParty/googletest-1.8.1/googlemock/include/gmock/gmock-actions.h +++ b/cinderx/ThirdParty/googletest-1.8.1/googlemock/include/gmock/gmock-actions.h @@ -847,7 +847,7 @@ struct InvokeMethodWithoutArgsAction { Class* const obj_ptr; const MethodPtr method_ptr; - using ReturnType = typename std::result_of::type; + using ReturnType = typename std::invoke_result::type; template ReturnType operator()(const Args&...) const { diff --git a/cinderx/ThirdParty/parallel-hashmap/parallel_hashmap/phmap_base.h b/cinderx/ThirdParty/parallel-hashmap/parallel_hashmap/phmap_base.h index fd75af68cec..4781f3be56f 100644 --- a/cinderx/ThirdParty/parallel-hashmap/parallel_hashmap/phmap_base.h +++ b/cinderx/ThirdParty/parallel-hashmap/parallel_hashmap/phmap_base.h @@ -332,7 +332,7 @@ template< class F, class... ArgTypes> #if PHMAP_HAVE_CC17 using invoke_result_t = typename std::invoke_result_t; #else - using invoke_result_t = typename std::result_of::type; + using invoke_result_t = typename std::invoke_result::type; #endif namespace type_traits_internal {