From 7c50ec0711f60365f86c624eed7795334c1a2851 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 10 Aug 2020 15:46:55 +0400 Subject: [PATCH] Fix build on macOS. --- webrtc_third_party.diff | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc_third_party.diff b/webrtc_third_party.diff index 1beafba..d872b4f 100644 --- a/webrtc_third_party.diff +++ b/webrtc_third_party.diff @@ -13,14 +13,14 @@ 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 +index ba87d2f0edf..b9c5340cd3c 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 ++#if __cplusplus > 201703L || (defined(_MSC_VER) && _MSVC_LANG > 201703L) +template +struct result_of_helper; +template