Merge branch 'master' into rclee-async-setupupstream/rclee-async-setup

1 files changed, 4 insertions, 4 deletions

diff --git a/platform/darwin/src/MGLPolygon.mm b/platform/darwin/src/MGLPolygon.mm
index 2af768d514..b80504707b 100644
--- a/platform/darwin/src/MGLPolygon.mm
+++ b/platform/darwin/src/MGLPolygon.mm
@@ -102,7 +102,7 @@
              @"coordinates": self.mgl_coordinates};
 }
 
-- (NS_ARRAY_OF(id) *)mgl_coordinates {
+- (NSArray<id> *)mgl_coordinates {
     NSMutableArray *coordinates = [NSMutableArray array];
 
     NSMutableArray *exteriorRing = [NSMutableArray array];
@@ -128,7 +128,7 @@
 
 @interface MGLMultiPolygon ()
 
-@property (nonatomic, copy, readwrite) NS_ARRAY_OF(MGLPolygon *) *polygons;
+@property (nonatomic, copy, readwrite) NSArray<MGLPolygon *> *polygons;
 
 @end
 
@@ -138,11 +138,11 @@
 
 @synthesize overlayBounds = _overlayBounds;
 
-+ (instancetype)multiPolygonWithPolygons:(NS_ARRAY_OF(MGLPolygon *) *)polygons {
++ (instancetype)multiPolygonWithPolygons:(NSArray<MGLPolygon *> *)polygons {
     return [[self alloc] initWithPolygons:polygons];
 }
 
-- (instancetype)initWithPolygons:(NS_ARRAY_OF(MGLPolygon *) *)polygons {
+- (instancetype)initWithPolygons:(NSArray<MGLPolygon *> *)polygons {
     if (self = [super init]) {
         _polygons = polygons;