From 28221dee850d3549c4ee7125f3a6db872d162873 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Wed, 27 Feb 2019 12:01:51 +0100 Subject: [PATCH] Fix more -Wextra-semi. Chromium has enabled -Wextra-semi on Android, iOS and Windwos builds: https://chromium-review.googlesource.com/c/1489138 https://chromium-review.googlesource.com/c/1489180 https://chromium-review.googlesource.com/c/1489102 This CL fixes some minor problems in WebRTC and it is a follow-up of https://webrtc-review.googlesource.com/c/src/+/123560 and https://webrtc-review.googlesource.com/c/124440. Bug: webrtc:10355, chromium:926235 Change-Id: Ie9e49077a72c783c3e0fbc21bbe237d7338407e4 Reviewed-on: https://webrtc-review.googlesource.com/c/124680 Reviewed-by: Karl Wiberg Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#26873} --- modules/video_capture/windows/sink_filter_ds.h | 2 +- sdk/android/src/jni/pc/rtp_transceiver.cc | 2 +- sdk/objc/native/src/objc_frame_buffer.mm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/video_capture/windows/sink_filter_ds.h b/modules/video_capture/windows/sink_filter_ds.h index cac6e52493..79810e6dd7 100644 --- a/modules/video_capture/windows/sink_filter_ds.h +++ b/modules/video_capture/windows/sink_filter_ds.h @@ -67,7 +67,7 @@ class CaptureSinkFilter : public CBaseFilter { // -------------------------------------------------------------------- // COM interfaces - DECLARE_IUNKNOWN; + DECLARE_IUNKNOWN STDMETHODIMP SetMatchingMediaType(const VideoCaptureCapability& capability); // -------------------------------------------------------------------- diff --git a/sdk/android/src/jni/pc/rtp_transceiver.cc b/sdk/android/src/jni/pc/rtp_transceiver.cc index 50844fda49..a958bc9cf8 100644 --- a/sdk/android/src/jni/pc/rtp_transceiver.cc +++ b/sdk/android/src/jni/pc/rtp_transceiver.cc @@ -65,7 +65,7 @@ ScopedJavaLocalRef NativeToJavaRtpTransceiver( JavaRtpTransceiverGlobalOwner::JavaRtpTransceiverGlobalOwner( JNIEnv* env, const JavaRef& j_transceiver) - : j_transceiver_(env, j_transceiver){}; + : j_transceiver_(env, j_transceiver) {} JavaRtpTransceiverGlobalOwner::JavaRtpTransceiverGlobalOwner( JavaRtpTransceiverGlobalOwner&& other) = default; diff --git a/sdk/objc/native/src/objc_frame_buffer.mm b/sdk/objc/native/src/objc_frame_buffer.mm index d1090fcef2..52e434152c 100644 --- a/sdk/objc/native/src/objc_frame_buffer.mm +++ b/sdk/objc/native/src/objc_frame_buffer.mm @@ -22,7 +22,7 @@ class ObjCI420FrameBuffer : public I420BufferInterface { public: explicit ObjCI420FrameBuffer(id frame_buffer) : frame_buffer_(frame_buffer), width_(frame_buffer.width), height_(frame_buffer.height) {} - ~ObjCI420FrameBuffer() override{}; + ~ObjCI420FrameBuffer() override {} int width() const override { return width_; }