diff --git a/webrtc_third_party.diff b/webrtc_third_party.diff index 617ec75..1beafba 100644 --- a/webrtc_third_party.diff +++ b/webrtc_third_party.diff @@ -12,6 +12,30 @@ index a62632e2c3f..ea2a9325a9c 100644 } config("libjpeg_turbo_config") { +diff --git a/abseil-cpp/absl/meta/type_traits.h b/abseil-cpp/absl/meta/type_traits.h +index ba87d2f0edf..fb9ffb721e8 100644 +--- a/abseil-cpp/absl/meta/type_traits.h ++++ b/abseil-cpp/absl/meta/type_traits.h +@@ -616,8 +616,19 @@ using common_type_t = typename std::common_type::type; + template + using underlying_type_t = typename std::underlying_type::type; + ++#if _MSVC_LANG > 201703L ++template ++struct result_of_helper; ++template ++struct result_of_helper { ++ using type = std::invoke_result_t; ++}; ++template ++using result_of_t = typename result_of_helper::type; ++#else // C++20 + template + using result_of_t = typename std::result_of::type; ++#endif // C++20 + + namespace type_traits_internal { + // In MSVC we can't probe std::hash or stdext::hash because it triggers a diff --git a/libjpeg.gni b/libjpeg.gni index 049348b79bd..039385c9739 100644 --- a/libjpeg.gni