From 2d8a287f9c5d052d37772fc0ef14c58e2a1054c3 Mon Sep 17 00:00:00 2001 From: rh389 Date: Mon, 9 Jan 2017 19:23:44 -0800 Subject: [PATCH] Mark params __unused or #pragma unused Summary: Motivation: reduce build noise that might worry new users or hide real problems. This deals with four of the warnings currently in the iOS build. The `__unused` additions are standard and self-explanatory, following the style used elsewhere in RN. I've used `#pragma unused` to deal with parameters named by macros. Tested by building and running the `UIExplorer` example app in XCode 8.2 Closes https://github.com/facebook/react-native/pull/11797 Differential Revision: D4396611 fbshipit-source-id: 728e9ebb94d147f7a2cbc674a25fe67e66e2e8b2 --- React/Modules/JSCSamplingProfiler.m | 2 +- React/Views/RCTMapManager.m | 5 +++-- React/Views/RCTScrollViewManager.m | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/React/Modules/JSCSamplingProfiler.m b/React/Modules/JSCSamplingProfiler.m index ff3efddb9..70a90f629 100644 --- a/React/Modules/JSCSamplingProfiler.m +++ b/React/Modules/JSCSamplingProfiler.m @@ -20,7 +20,7 @@ RCT_EXPORT_MODULE(JSCSamplingProfiler); #ifdef RCT_PROFILE -RCT_EXPORT_METHOD(operationComplete:(int)token result:(id)profileData error:(id)error) +RCT_EXPORT_METHOD(operationComplete:(__unused int)token result:(id)profileData error:(id)error) { if (error) { RCTLogError(@"JSC Sampling profiler ended with error: %@", error); diff --git a/React/Views/RCTMapManager.m b/React/Views/RCTMapManager.m index 567ced4dd..c52c7179a 100644 --- a/React/Views/RCTMapManager.m +++ b/React/Views/RCTMapManager.m @@ -104,6 +104,7 @@ RCT_EXPORT_VIEW_PROPERTY(onChange, RCTBubblingEventBlock) RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock) RCT_CUSTOM_VIEW_PROPERTY(region, MKCoordinateRegion, RCTMap) { +#pragma unused (defaultView) if (json) { [view setRegion:[RCTConvert MKCoordinateRegion:json] animated:YES]; } @@ -290,7 +291,7 @@ RCT_CUSTOM_VIEW_PROPERTY(region, MKCoordinateRegion, RCTMap) return annotationView; } -- (void)mapView:(RCTMap *)mapView didAddAnnotationViews:(NSArray *)views { +- (void)mapView:(RCTMap *)mapView didAddAnnotationViews:(__unused NSArray *)views { if (mapView.showsAnnotationCallouts) { for (id annotation in mapView.annotations) { [mapView selectAnnotation:annotation animated:YES]; @@ -298,7 +299,7 @@ RCT_CUSTOM_VIEW_PROPERTY(region, MKCoordinateRegion, RCTMap) } } -- (MKOverlayRenderer *)mapView:(MKMapView *)mapView rendererForOverlay:(id)overlay +- (MKOverlayRenderer *)mapView:(__unused MKMapView *)mapView rendererForOverlay:(id)overlay { RCTAssert([overlay isKindOfClass:[RCTMapOverlay class]], @"Overlay must be of type RCTMapOverlay"); MKPolylineRenderer *polylineRenderer = [[MKPolylineRenderer alloc] initWithPolyline:overlay]; diff --git a/React/Views/RCTScrollViewManager.m b/React/Views/RCTScrollViewManager.m index 91f5634f0..fff5061f0 100644 --- a/React/Views/RCTScrollViewManager.m +++ b/React/Views/RCTScrollViewManager.m @@ -88,6 +88,7 @@ RCT_EXPORT_VIEW_PROPERTY(onScrollAnimationEnd, RCTDirectEventBlock) // that css-layout is always treating the contents of a scroll container as // overflow: 'scroll'. RCT_CUSTOM_SHADOW_PROPERTY(overflow, YGOverflow, RCTShadowView) { +#pragma unused (json) view.overflow = YGOverflowScroll; }