From 28dbf972428131bff700015bba597720f3e09013 Mon Sep 17 00:00:00 2001 From: Peter Hanspers Date: Thu, 1 Feb 2018 13:33:18 +0100 Subject: [PATCH] Fixing warnings in public iOS SDK headers. Building with the newly published cocoapod generated a few warnings, which looked a bit bad. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:8831 Change-Id: I70c06930603b328e4d11c599a5b5dd77b45150c6 Reviewed-on: https://webrtc-review.googlesource.com/46163 Reviewed-by: Anders Carlsson Reviewed-by: Kári Helgason Commit-Queue: Peter Hanspers Cr-Commit-Position: refs/heads/master@{#21846} --- .../Classes/PeerConnection/RTCCameraVideoCapturer.m | 2 +- sdk/objc/Framework/Classes/PeerConnection/RTCMetrics.mm | 4 ++-- sdk/objc/Framework/Classes/PeerConnection/RTCSSLAdapter.mm | 4 ++-- sdk/objc/Framework/Classes/PeerConnection/RTCTracing.mm | 6 +++--- sdk/objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h | 2 +- sdk/objc/Framework/Headers/WebRTC/RTCMetrics.h | 5 +++-- sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h | 4 ++-- sdk/objc/Framework/Headers/WebRTC/RTCTracing.h | 6 +++--- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCCameraVideoCapturer.m b/sdk/objc/Framework/Classes/PeerConnection/RTCCameraVideoCapturer.m index a7d1ec1bc0..c4ee1f2b45 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCCameraVideoCapturer.m +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCCameraVideoCapturer.m @@ -168,7 +168,7 @@ const int64_t kNanosecondsPerSecond = 1000000000; }]; } -- (void)stopCaptureWithCompletionHandler:(nullable void (^)())completionHandler { +- (void)stopCaptureWithCompletionHandler:(nullable void (^)(void))completionHandler { _willBeRunning = NO; [RTCDispatcher dispatchAsyncOnType:RTCDispatcherTypeCaptureSession diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCMetrics.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCMetrics.mm index 279a2bec31..2e80216dea 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCMetrics.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCMetrics.mm @@ -12,11 +12,11 @@ #import "RTCMetricsSampleInfo+Private.h" -void RTCEnableMetrics() { +void RTCEnableMetrics(void) { webrtc::metrics::Enable(); } -NSArray *RTCGetAndResetMetrics() { +NSArray *RTCGetAndResetMetrics(void) { std::map> histograms; webrtc::metrics::GetAndReset(&histograms); diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCSSLAdapter.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCSSLAdapter.mm index a64ff49c56..dfe54b5e20 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCSSLAdapter.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCSSLAdapter.mm @@ -13,13 +13,13 @@ #include "rtc_base/checks.h" #include "rtc_base/ssladapter.h" -BOOL RTCInitializeSSL() { +BOOL RTCInitializeSSL(void) { BOOL initialized = rtc::InitializeSSL(); RTC_DCHECK(initialized); return initialized; } -BOOL RTCCleanupSSL() { +BOOL RTCCleanupSSL(void) { BOOL cleanedUp = rtc::CleanupSSL(); RTC_DCHECK(cleanedUp); return cleanedUp; diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCTracing.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCTracing.mm index f29c161d96..7bcd6496e3 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCTracing.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCTracing.mm @@ -12,7 +12,7 @@ #include "rtc_base/event_tracer.h" -void RTCSetupInternalTracer() { +void RTCSetupInternalTracer(void) { rtc::tracing::SetupInternalTracer(); } @@ -20,10 +20,10 @@ BOOL RTCStartInternalCapture(NSString *filePath) { return rtc::tracing::StartInternalCapture(filePath.UTF8String); } -void RTCStopInternalCapture() { +void RTCStopInternalCapture(void) { rtc::tracing::StopInternalCapture(); } -void RTCShutdownInternalTracer() { +void RTCShutdownInternalTracer(void) { rtc::tracing::ShutdownInternalTracer(); } diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h b/sdk/objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h index 31b405c542..5c7406fcf0 100644 --- a/sdk/objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h +++ b/sdk/objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h @@ -41,7 +41,7 @@ RTC_EXPORT fps:(NSInteger)fps completionHandler:(nullable void (^)(NSError *))completionHandler; // Stops the capture session asynchronously and notifies callback on completion. -- (void)stopCaptureWithCompletionHandler:(nullable void (^)())completionHandler; +- (void)stopCaptureWithCompletionHandler:(nullable void (^)(void))completionHandler; // Starts the capture session asynchronously. - (void)startCaptureWithDevice:(AVCaptureDevice *)device diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCMetrics.h b/sdk/objc/Framework/Headers/WebRTC/RTCMetrics.h index fa2d48fa07..d22287e551 100644 --- a/sdk/objc/Framework/Headers/WebRTC/RTCMetrics.h +++ b/sdk/objc/Framework/Headers/WebRTC/RTCMetrics.h @@ -17,7 +17,8 @@ * Enables gathering of metrics (which can be fetched with * RTCGetAndResetMetrics). Must be called before any other call into WebRTC. */ -RTC_EXTERN void RTCEnableMetrics(); +RTC_EXTERN void RTCEnableMetrics(void); /** Gets and clears native histograms. */ -RTC_EXTERN NSArray *RTCGetAndResetMetrics(); +RTC_EXTERN NSArray *RTCGetAndResetMetrics(void); + diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h b/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h index c862d29792..a0da827c35 100644 --- a/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h +++ b/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h @@ -16,5 +16,5 @@ * Initialize and clean up the SSL library. Failure is fatal. These call the * corresponding functions in webrtc/rtc_base/ssladapter.h. */ -RTC_EXTERN BOOL RTCInitializeSSL(); -RTC_EXTERN BOOL RTCCleanupSSL(); +RTC_EXTERN BOOL RTCInitializeSSL(void); +RTC_EXTERN BOOL RTCCleanupSSL(void); diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCTracing.h b/sdk/objc/Framework/Headers/WebRTC/RTCTracing.h index 136479118b..5e7e48f294 100644 --- a/sdk/objc/Framework/Headers/WebRTC/RTCTracing.h +++ b/sdk/objc/Framework/Headers/WebRTC/RTCTracing.h @@ -12,10 +12,10 @@ #import -RTC_EXTERN void RTCSetupInternalTracer(); +RTC_EXTERN void RTCSetupInternalTracer(void); /** Starts capture to specified file. Must be a valid writable path. * Returns YES if capture starts. */ RTC_EXTERN BOOL RTCStartInternalCapture(NSString *filePath); -RTC_EXTERN void RTCStopInternalCapture(); -RTC_EXTERN void RTCShutdownInternalTracer(); +RTC_EXTERN void RTCStopInternalCapture(void); +RTC_EXTERN void RTCShutdownInternalTracer(void);