From 0198933b3d49941a567f3957984a06750865d0b1 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Tue, 16 Dec 2014 12:29:59 +0000 Subject: [PATCH] Cleanup: Remove 'const' qualifier from OnReceivedEstimatedBitrate(). This should fix the following error I'm seeing in Win8 GN trybot: e:\b\build\slave\win_gn\build\src\third_party\webrtc\modules\bitrate_controller\bitrate_controller_impl.cc(78) : error C2220: warning treated as error - no 'object' file generated e:\b\build\slave\win_gn\build\src\third_party\webrtc\modules\bitrate_controller\bitrate_controller_impl.cc(30) : warning C4373: 'webrtc::BitrateControllerImpl::RtcpBandwidthObserverImpl::OnReceivedEstimatedBitrate': virtual function overrides 'webrtc::RtcpBandwidthObserver::OnReceivedEstimatedBitrate', previous versions of the compiler did not override when parameters only differed by const/volatile qualifiers e:\b\build\slave\win_gn\build\src\third_party\webrtc\modules\rtp_rtcp\interface\rtp_rtcp_defines.h(286) : see declaration of 'webrtc::RtcpBandwidthObserver::OnReceivedEstimatedBitrate' http://build.chromium.org/p/tryserver.chromium.win/builders/win8_chromium_gn_dbg/builds/23/steps/compile/logs/stdio The above was triggered in CL https://codereview.chromium.org/802113002/ BUG=None R=kjellander@google.com, kjellander@webrtc.org, tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/37409004 Patch from Thiago Farina . git-svn-id: http://webrtc.googlecode.com/svn/trunk@7911 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h b/webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h index e94be57af6..b1903a4032 100644 --- a/webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h +++ b/webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h @@ -283,7 +283,7 @@ class RtcpIntraFrameObserver { class RtcpBandwidthObserver { public: // REMB or TMMBR - virtual void OnReceivedEstimatedBitrate(const uint32_t bitrate) = 0; + virtual void OnReceivedEstimatedBitrate(uint32_t bitrate) = 0; virtual void OnReceivedRtcpReceiverReport( const ReportBlockList& report_blocks,