commit ef8b61e11062295365f11b9942f18a08a8b3ec60
author nisse <nisse@webrtc.org> Fri Apr 29 06:09:15 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri Apr 29 13:09:23 2016 +0000
tree de14fb8f5d565be541d6536116c057d2561716e9
parent b296d0591cd71baacb4ecbd1a4698a6eb2b17bca

Enable -Winconsistent-missing-override flag.

The problem with gmock is worked around by commenting out any other override declarations in classes using gmock.

NOPRESUBMIT=True
BUG=webrtc:3970

Review-Url: https://codereview.webrtc.org/1921653002
Cr-Commit-Position: refs/heads/master@{#12563}

webrtc/api/mediastream.h

diff --git a/webrtc/api/mediastream.h b/webrtc/api/mediastream.h
index 2a77f0d..1f80f25 100644
--- a/webrtc/api/mediastream.h
+++ b/webrtc/api/mediastream.h
@@ -31,10 +31,10 @@
   bool AddTrack(VideoTrackInterface* track) override;
   bool RemoveTrack(AudioTrackInterface* track) override;
   bool RemoveTrack(VideoTrackInterface* track) override;
-  virtual rtc::scoped_refptr<AudioTrackInterface>
-      FindAudioTrack(const std::string& track_id);
-  virtual rtc::scoped_refptr<VideoTrackInterface>
-      FindVideoTrack(const std::string& track_id);
+  rtc::scoped_refptr<AudioTrackInterface>
+      FindAudioTrack(const std::string& track_id) override;
+  rtc::scoped_refptr<VideoTrackInterface>
+      FindVideoTrack(const std::string& track_id) override;
 
   AudioTrackVector GetAudioTracks() override { return audio_tracks_; }
   VideoTrackVector GetVideoTracks() override { return video_tracks_; }