From d01d91d1aec9cca8dc7259009a6b3db0900e8623 Mon Sep 17 00:00:00 2001 From: Ruslan Arutyunyan Date: Mon, 31 Jan 2022 21:40:16 +0300 Subject: [libc++][pstl][NFC] Remove usage of std::result_of from Parallel STL std::result_of creates problems when building with C++20 because it's deprecated there. The solution is to remove it and get return value type for a function with decltype. Substitute std::invoke_result for std::result_of is unnecessary because we don't have std::invoke semantics within the function - we don't work with pointer-to-member's. Reviewed by: ldionne, MikeDvorskiy, #libc Differential Revision: https://reviews.llvm.org/D118457 --- pstl/include/pstl/internal/utils.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pstl') diff --git a/pstl/include/pstl/internal/utils.h b/pstl/include/pstl/internal/utils.h index c181ddb4b8a6..ec9d46713a68 100644 --- a/pstl/include/pstl/internal/utils.h +++ b/pstl/include/pstl/internal/utils.h @@ -21,8 +21,8 @@ namespace __internal { template -typename std::result_of<_Fp()>::type -__except_handler(_Fp __f) +auto +__except_handler(_Fp __f) -> decltype(__f()) { try { -- cgit v1.2.1