From ca110b808f368221c7ea7f72c8b0dab651902835 Mon Sep 17 00:00:00 2001 From: "henrikg@webrtc.org" Date: Fri, 26 Sep 2014 11:09:08 +0000 Subject: [PATCH] Mark virtual overrides of ViENetwork and VoENetwork as such. This will make further changes to these classes safer by ensuring that the compile breaks if the base class changes and not all overrides are fixed. BUG=none TEST=none R=henrikg@webrtc.org, mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/26439004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7305 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/video_engine/vie_network_impl.h | 23 +++++++++++++---------- webrtc/voice_engine/voe_network_impl.h | 11 ++++++----- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/webrtc/video_engine/vie_network_impl.h b/webrtc/video_engine/vie_network_impl.h index 03547d88ba..e9ca75469d 100644 --- a/webrtc/video_engine/vie_network_impl.h +++ b/webrtc/video_engine/vie_network_impl.h @@ -24,26 +24,29 @@ class ViENetworkImpl public ViERefCount { public: // Implements ViENetwork. - virtual int Release(); + virtual int Release() OVERRIDE; virtual void SetNetworkTransmissionState(const int video_channel, - const bool is_transmitting); + const bool is_transmitting) OVERRIDE; virtual int RegisterSendTransport(const int video_channel, - Transport& transport); - virtual int DeregisterSendTransport(const int video_channel); + Transport& transport) OVERRIDE; + virtual int DeregisterSendTransport(const int video_channel) OVERRIDE; virtual int ReceivedRTPPacket(const int video_channel, const void* data, const int length, - const PacketTime& packet_time); + const PacketTime& packet_time) OVERRIDE; virtual int ReceivedRTCPPacket(const int video_channel, const void* data, - const int length); - virtual int SetMTU(int video_channel, unsigned int mtu); + const int length) OVERRIDE; + virtual int SetMTU(int video_channel, unsigned int mtu) OVERRIDE; virtual int ReceivedBWEPacket(const int video_channel, - int64_t arrival_time_ms, int payload_size, const RTPHeader& header); + int64_t arrival_time_ms, + int payload_size, + const RTPHeader& header) OVERRIDE; - virtual bool SetBandwidthEstimationConfig(int video_channel, - const webrtc::Config& config); + virtual bool SetBandwidthEstimationConfig( + int video_channel, + const webrtc::Config& config) OVERRIDE; protected: explicit ViENetworkImpl(ViESharedData* shared_data); diff --git a/webrtc/voice_engine/voe_network_impl.h b/webrtc/voice_engine/voe_network_impl.h index 7e09d04d75..0cf07ad1fd 100644 --- a/webrtc/voice_engine/voe_network_impl.h +++ b/webrtc/voice_engine/voe_network_impl.h @@ -22,21 +22,22 @@ namespace webrtc class VoENetworkImpl: public VoENetwork { public: - virtual int RegisterExternalTransport(int channel, Transport& transport); + virtual int RegisterExternalTransport(int channel, + Transport& transport) OVERRIDE; - virtual int DeRegisterExternalTransport(int channel); + virtual int DeRegisterExternalTransport(int channel) OVERRIDE; virtual int ReceivedRTPPacket(int channel, const void* data, - unsigned int length); + unsigned int length) OVERRIDE; virtual int ReceivedRTPPacket(int channel, const void* data, unsigned int length, - const PacketTime& packet_time); + const PacketTime& packet_time) OVERRIDE; virtual int ReceivedRTCPPacket(int channel, const void* data, - unsigned int length); + unsigned int length) OVERRIDE; protected: VoENetworkImpl(voe::SharedData* shared);