From cfa0e8ffe29a06dcce7afaab3ff44e73ce57dad6 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Thu, 2 Apr 2020 09:50:33 +0200 Subject: [PATCH] Fix errors C2238, C2248 and C2059 on MSVC bots. This CL fixes the following errors on MSVC bots: ../../rtc_base/units/unit_base_unittest.cc(42): error C2059: syntax error: '<' ../../rtc_base/units/unit_base_unittest.cc(42): error C2238: unexpected token(s) preceding ';' ../..\rtc_base/units/unit_base.h(39): error C2248: 'webrtc::`anonymous-namespace'::TestUnit::TestUnit': cannot access protected member declared in class 'webrtc::`anonymous-namespace'::TestUnit' No-Try: True Bug: None Change-Id: Ic63a75132107381474aca2e1d42ba96d1f6a1c00 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/172621 Commit-Queue: Mirko Bonadei Reviewed-by: Karl Wiberg Cr-Commit-Position: refs/heads/master@{#30972} --- rtc_base/units/unit_base_unittest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtc_base/units/unit_base_unittest.cc b/rtc_base/units/unit_base_unittest.cc index 02ead7ce0b..bbdbd8cd10 100644 --- a/rtc_base/units/unit_base_unittest.cc +++ b/rtc_base/units/unit_base_unittest.cc @@ -39,7 +39,7 @@ class TestUnit final : public rtc_units_impl::RelativeUnit { } private: - friend class UnitBase; + friend class rtc_units_impl::UnitBase; static constexpr bool one_sided = false; using RelativeUnit::RelativeUnit; };