diff --git a/system_wrappers/BUILD.gn b/system_wrappers/BUILD.gn index e70aea429c..4c09164abd 100644 --- a/system_wrappers/BUILD.gn +++ b/system_wrappers/BUILD.gn @@ -91,11 +91,6 @@ rtc_static_library("system_wrappers") { deps += [ "../rtc_base:rtc_base" ] } - if (is_win && is_clang) { - # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). - suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] - } - deps += [ "../rtc_base:rtc_base_approved", "../rtc_base:rtc_numerics", @@ -218,11 +213,6 @@ if (rtc_include_tests) { sources += [ "source/event_timer_posix_unittest.cc" ] } - if (!build_with_chromium && is_clang) { - # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). - suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] - } - deps = [ ":metrics_api", ":metrics_default", diff --git a/system_wrappers/source/clock.cc b/system_wrappers/source/clock.cc index fd73531d7b..c9940fbe99 100644 --- a/system_wrappers/source/clock.cc +++ b/system_wrappers/source/clock.cc @@ -90,7 +90,7 @@ class WindowsRealTimeClock : public RealTimeClock { num_timer_wraps_(0), ref_point_(GetSystemReferencePoint()) {} - virtual ~WindowsRealTimeClock() {} + ~WindowsRealTimeClock() override {} protected: struct ReferencePoint { diff --git a/system_wrappers/source/event_timer_posix_unittest.cc b/system_wrappers/source/event_timer_posix_unittest.cc index e0c5cbc477..88fd90aef8 100644 --- a/system_wrappers/source/event_timer_posix_unittest.cc +++ b/system_wrappers/source/event_timer_posix_unittest.cc @@ -35,7 +35,7 @@ class EventTimerPosixTest : public testing::Test, public EventTimerPosix { main_event_(false, true), process_thread_id_(0), process_thread_(nullptr) {} - virtual ~EventTimerPosixTest() {} + ~EventTimerPosixTest() override {} rtc::PlatformThread* CreateThread() override { EXPECT_TRUE(process_thread_ == nullptr); diff --git a/system_wrappers/source/event_timer_win.h b/system_wrappers/source/event_timer_win.h index 5631a3fbc4..0b4dff60e0 100644 --- a/system_wrappers/source/event_timer_win.h +++ b/system_wrappers/source/event_timer_win.h @@ -22,13 +22,13 @@ namespace webrtc { class EventTimerWin : public EventTimerWrapper { public: EventTimerWin(); - virtual ~EventTimerWin(); + ~EventTimerWin() override; - virtual EventTypeWrapper Wait(unsigned long max_time); - virtual bool Set(); + EventTypeWrapper Wait(unsigned long max_time) override; + bool Set() override; - virtual bool StartTimer(bool periodic, unsigned long time); - virtual bool StopTimer(); + bool StartTimer(bool periodic, unsigned long time) override; + bool StopTimer() override; private: HANDLE event_; diff --git a/system_wrappers/source/metrics_default_unittest.cc b/system_wrappers/source/metrics_default_unittest.cc index fa253a9bfe..7491a2f513 100644 --- a/system_wrappers/source/metrics_default_unittest.cc +++ b/system_wrappers/source/metrics_default_unittest.cc @@ -54,7 +54,7 @@ class MetricsDefaultTest : public ::testing::Test { MetricsDefaultTest() {} protected: - virtual void SetUp() { metrics::Reset(); } + void SetUp() override { metrics::Reset(); } }; TEST_F(MetricsDefaultTest, Reset) { diff --git a/system_wrappers/source/metrics_unittest.cc b/system_wrappers/source/metrics_unittest.cc index 53d43cd2b1..4218ad751d 100644 --- a/system_wrappers/source/metrics_unittest.cc +++ b/system_wrappers/source/metrics_unittest.cc @@ -29,7 +29,7 @@ class MetricsTest : public ::testing::Test { MetricsTest() {} protected: - virtual void SetUp() { metrics::Reset(); } + void SetUp() override { metrics::Reset(); } }; TEST_F(MetricsTest, InitiallyNoSamples) {