From d2fce1744f9cfc4fceaa971e6b394d0d1fa7248b Mon Sep 17 00:00:00 2001 From: magjed Date: Wed, 2 Nov 2016 11:08:29 -0700 Subject: [PATCH] Suppress WebRtcVideoEncoderFactory overloaded virtual function warning Suppress WebRtcVideoEncoderFactory overloaded virtual function warning in WebRtcSimulcastEncoderFactory and FakeWebRtcVideoEncoderFactory. This warning is triggered by the change in this CL: https://codereview.webrtc.org/2449993003/. BUG=webrtc:6402, webrtc:6337 Review-Url: https://codereview.webrtc.org/2468253002 Cr-Commit-Position: refs/heads/master@{#14901} --- webrtc/media/engine/fakewebrtcvideoengine.h | 4 ++++ webrtc/media/engine/webrtcvideoengine2.cc | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/webrtc/media/engine/fakewebrtcvideoengine.h b/webrtc/media/engine/fakewebrtcvideoengine.h index bbc93e0d40..a6cfeb3edf 100644 --- a/webrtc/media/engine/fakewebrtcvideoengine.h +++ b/webrtc/media/engine/fakewebrtcvideoengine.h @@ -248,6 +248,10 @@ class FakeWebRtcVideoEncoderFactory : public WebRtcVideoEncoderFactory { } private: + // Disable overloaded virtual function warning. TODO(magjed): Remove once + // http://crbug/webrtc/6402 is fixed. + using cricket::WebRtcVideoEncoderFactory::CreateVideoEncoder; + rtc::CriticalSection crit_; rtc::Event created_video_encoder_event_; std::vector codecs_; diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc index d3e71a381f..e37bf94a65 100644 --- a/webrtc/media/engine/webrtcvideoengine2.cc +++ b/webrtc/media/engine/webrtcvideoengine2.cc @@ -149,6 +149,10 @@ class WebRtcSimulcastEncoderFactory } private: + // Disable overloaded virtual function warning. TODO(magjed): Remove once + // http://crbug/webrtc/6402 is fixed. + using cricket::WebRtcVideoEncoderFactory::CreateVideoEncoder; + cricket::WebRtcVideoEncoderFactory* factory_; // A list of encoders that were created without being wrapped in a // SimulcastEncoderAdapter.