Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1713)

Unified Diff: talk/session/media/channel.h

Issue 1417543002: Added override keyword to overridden methods to stop compiler warnings. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Remove virtual Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « talk/media/webrtc/webrtcvideoframe.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/session/media/channel.h
diff --git a/talk/session/media/channel.h b/talk/session/media/channel.h
index 27088c921c5ccabb2d586c3d684d2d4bad13ddc7..603115cee7f58a06a37cbaff94cd5cd56c1837c3 100644
--- a/talk/session/media/channel.h
+++ b/talk/session/media/channel.h
@@ -164,7 +164,8 @@ class BaseChannel
void SetReadyToSend(bool rtcp, bool ready);
// Only public for unit tests. Otherwise, consider protected.
- virtual int SetOption(SocketType type, rtc::Socket::Option o, int val);
+ int SetOption(SocketType type, rtc::Socket::Option o, int val)
+ override;
SrtpFilter* srtp_filter() { return &srtp_filter_; }
@@ -198,9 +199,10 @@ class BaseChannel
void FlushRtcpMessages();
// NetworkInterface implementation, called by MediaEngine
- virtual bool SendPacket(rtc::Buffer* packet,
- const rtc::PacketOptions& options);
- virtual bool SendRtcp(rtc::Buffer* packet, const rtc::PacketOptions& options);
+ bool SendPacket(rtc::Buffer* packet,
+ const rtc::PacketOptions& options) override;
+ bool SendRtcp(rtc::Buffer* packet, const rtc::PacketOptions& options)
+ override;
// From TransportChannel
void OnWritableState(TransportChannel* channel);
@@ -277,7 +279,7 @@ class BaseChannel
std::string* error_desc);
// From MessageHandler
- virtual void OnMessage(rtc::Message* pmsg);
+ void OnMessage(rtc::Message* pmsg) override;
// Handled in derived classes
// Get the SRTP ciphers to use for RTP media
« no previous file with comments | « talk/media/webrtc/webrtcvideoframe.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698