From cdd35536417fe16cc60e225f1bd7462f4242e795 Mon Sep 17 00:00:00 2001 From: Jason Wray Date: Tue, 24 Jul 2018 18:08:12 -0400 Subject: [darwin] Use FOUNDATION_EXTERN instead of plain extern FOUNDATION_EXTERN is an alias for extern in most cases, but also covers us in the event that a method could be mismangled by the compiler as C++ (when we want C-style mangling, for Obj-C compatibility). --- platform/darwin/src/MGLComputedShapeSource.h | 4 ++-- platform/darwin/src/MGLOfflineStorage.h | 22 +++++++++++----------- platform/darwin/src/MGLRasterDEMSource.h | 2 +- platform/darwin/src/MGLRasterTileSource.h | 2 +- platform/darwin/src/MGLShapeSource.h | 14 +++++++------- platform/darwin/src/MGLStyleValue.h | 4 ++-- platform/darwin/src/MGLTileSource.h | 16 ++++++++-------- platform/darwin/src/MGLTypes.h | 2 +- platform/darwin/src/NSExpression+MGLAdditions.h | 6 +++--- .../darwin/src/NSExpression+MGLPrivateAdditions.h | 2 +- platform/ios/src/MGLMapView.h | 6 +++--- platform/ios/src/MGLMapView_Private.h | 2 +- 12 files changed, 41 insertions(+), 41 deletions(-) diff --git a/platform/darwin/src/MGLComputedShapeSource.h b/platform/darwin/src/MGLComputedShapeSource.h index 7e0037df89..faf8871fc7 100644 --- a/platform/darwin/src/MGLComputedShapeSource.h +++ b/platform/darwin/src/MGLComputedShapeSource.h @@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN This option is used with the `MGLComputedShapeSource` class; it is ignored when creating an `MGLShapeSource` object. */ -extern MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionWrapsCoordinates; +FOUNDATION_EXTERN MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionWrapsCoordinates; /** An `NSNumber` object containing a Boolean value; specifies whether the shape of @@ -30,7 +30,7 @@ extern MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionWrapsCoordinate This option is used with the `MGLComputedShapeSource` class; it is ignored when creating an `MGLShapeSource` object. */ -extern MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionClipsCoordinates; +FOUNDATION_EXTERN MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionClipsCoordinates; /** Data source for `MGLComputedShapeSource`. This protocol defines two optional methods for fetching diff --git a/platform/darwin/src/MGLOfflineStorage.h b/platform/darwin/src/MGLOfflineStorage.h index ab36592634..250efd23a6 100644 --- a/platform/darwin/src/MGLOfflineStorage.h +++ b/platform/darwin/src/MGLOfflineStorage.h @@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN alternatively observe KVO change notifications to the pack’s `progress` key path. */ -extern MGL_EXPORT const NSNotificationName MGLOfflinePackProgressChangedNotification; +FOUNDATION_EXTERN MGL_EXPORT const NSNotificationName MGLOfflinePackProgressChangedNotification; /** Posted by the shared `MGLOfflineStorage` object whenever an `MGLOfflinePack` @@ -40,7 +40,7 @@ extern MGL_EXPORT const NSNotificationName MGLOfflinePackProgressChangedNotifica `userInfo` dictionary contains the error object in the `MGLOfflinePackErrorUserInfoKey` key. */ -extern MGL_EXPORT const NSNotificationName MGLOfflinePackErrorNotification; +FOUNDATION_EXTERN MGL_EXPORT const NSNotificationName MGLOfflinePackErrorNotification; /** Posted by the shared `MGLOfflineStorage` object when the maximum number of @@ -55,7 +55,7 @@ extern MGL_EXPORT const NSNotificationName MGLOfflinePackErrorNotification; calling the `-[MGLOfflineStorage removePack:withCompletionHandler:]` method. Contact your Mapbox sales representative to have the limit raised. */ -extern MGL_EXPORT const NSNotificationName MGLOfflinePackMaximumMapboxTilesReachedNotification; +FOUNDATION_EXTERN MGL_EXPORT const NSNotificationName MGLOfflinePackMaximumMapboxTilesReachedNotification; /** A key in the `userInfo` property of a notification posted by `MGLOfflinePack`. @@ -68,9 +68,9 @@ typedef NSString *MGLOfflinePackUserInfoKey NS_EXTENSIBLE_STRING_ENUM; `MGLOfflinePackProgressChangedNotification` notification. Call `-integerValue` on the object to receive the `MGLOfflinePackState`-typed state. */ -extern MGL_EXPORT const MGLOfflinePackUserInfoKey MGLOfflinePackUserInfoKeyState; +FOUNDATION_EXTERN MGL_EXPORT const MGLOfflinePackUserInfoKey MGLOfflinePackUserInfoKeyState; -extern MGL_EXPORT NSString * const MGLOfflinePackStateUserInfoKey __attribute__((unavailable("Use MGLOfflinePackUserInfoKeyState"))); +FOUNDATION_EXTERN MGL_EXPORT NSString * const MGLOfflinePackStateUserInfoKey __attribute__((unavailable("Use MGLOfflinePackUserInfoKeyState"))); /** The key for an `NSValue` object that indicates an offline pack’s current @@ -79,9 +79,9 @@ extern MGL_EXPORT NSString * const MGLOfflinePackStateUserInfoKey __attribute__( `-MGLOfflinePackProgressValue` on the object to receive the `MGLOfflinePackProgress`-typed progress. */ -extern MGL_EXPORT const MGLOfflinePackUserInfoKey MGLOfflinePackUserInfoKeyProgress; +FOUNDATION_EXTERN MGL_EXPORT const MGLOfflinePackUserInfoKey MGLOfflinePackUserInfoKeyProgress; -extern MGL_EXPORT NSString * const MGLOfflinePackProgressUserInfoKey __attribute__((unavailable("Use MGLOfflinePackUserInfoKeyProgress"))); +FOUNDATION_EXTERN MGL_EXPORT NSString * const MGLOfflinePackProgressUserInfoKey __attribute__((unavailable("Use MGLOfflinePackUserInfoKeyProgress"))); /** The key for an `NSError` object that is encountered in the course of @@ -89,9 +89,9 @@ extern MGL_EXPORT NSString * const MGLOfflinePackProgressUserInfoKey __attribute an `MGLOfflinePackErrorNotification` notification. The error’s domain is `MGLErrorDomain`. See `MGLErrorCode` for possible error codes. */ -extern MGL_EXPORT const MGLOfflinePackUserInfoKey MGLOfflinePackUserInfoKeyError; +FOUNDATION_EXTERN MGL_EXPORT const MGLOfflinePackUserInfoKey MGLOfflinePackUserInfoKeyError; -extern MGL_EXPORT NSString * const MGLOfflinePackErrorUserInfoKey __attribute__((unavailable("Use MGLOfflinePackUserInfoKeyError"))); +FOUNDATION_EXTERN MGL_EXPORT NSString * const MGLOfflinePackErrorUserInfoKey __attribute__((unavailable("Use MGLOfflinePackUserInfoKeyError"))); /** The key for an `NSNumber` object that indicates the maximum number of @@ -101,9 +101,9 @@ extern MGL_EXPORT NSString * const MGLOfflinePackErrorUserInfoKey __attribute__( `-unsignedLongLongValue` on the object to receive the `uint64_t`-typed tile limit. */ -extern MGL_EXPORT const MGLOfflinePackUserInfoKey MGLOfflinePackUserInfoKeyMaximumCount; +FOUNDATION_EXTERN MGL_EXPORT const MGLOfflinePackUserInfoKey MGLOfflinePackUserInfoKeyMaximumCount; -extern MGL_EXPORT NSString * const MGLOfflinePackMaximumCountUserInfoKey __attribute__((unavailable("Use MGLOfflinePackUserInfoKeyMaximumCount"))); +FOUNDATION_EXTERN MGL_EXPORT NSString * const MGLOfflinePackMaximumCountUserInfoKey __attribute__((unavailable("Use MGLOfflinePackUserInfoKeyMaximumCount"))); /** A block to be called once an offline pack has been completely created and diff --git a/platform/darwin/src/MGLRasterDEMSource.h b/platform/darwin/src/MGLRasterDEMSource.h index d439fe1645..e42e4d8ec8 100644 --- a/platform/darwin/src/MGLRasterDEMSource.h +++ b/platform/darwin/src/MGLRasterDEMSource.h @@ -13,7 +13,7 @@ with the `MGLRasterDEMSource` class and is ignored when creating an `MGLRasterTileSource` or `MGLVectorTileSource` object. */ -extern MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionDEMEncoding; +FOUNDATION_EXTERN MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionDEMEncoding; /** `MGLRasterDEMSource` is a map content source that supplies rasterized diff --git a/platform/darwin/src/MGLRasterTileSource.h b/platform/darwin/src/MGLRasterTileSource.h index f27cbc285f..8f00be0ea4 100644 --- a/platform/darwin/src/MGLRasterTileSource.h +++ b/platform/darwin/src/MGLRasterTileSource.h @@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN This option is only applicable to `MGLRasterTileSource` objects; it is ignored when initializing `MGLVectorTileSource` objects. */ -extern MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionTileSize; +FOUNDATION_EXTERN MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionTileSize; /** `MGLRasterTileSource` is a map content source that supplies raster image tiles diff --git a/platform/darwin/src/MGLShapeSource.h b/platform/darwin/src/MGLShapeSource.h index 1fc00d4de0..e5c62515e5 100644 --- a/platform/darwin/src/MGLShapeSource.h +++ b/platform/darwin/src/MGLShapeSource.h @@ -24,7 +24,7 @@ typedef NSString *MGLShapeSourceOption NS_STRING_ENUM; This option only affects point features within an `MGLShapeSource` object; it is ignored when creating an `MGLComputedShapeSource` object. */ -extern MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionClustered; +FOUNDATION_EXTERN MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionClustered; /** An `NSNumber` object containing an integer; specifies the radius of each @@ -34,7 +34,7 @@ extern MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionClustered; This option only affects point features within an `MGLShapeSource` object; it is ignored when creating an `MGLComputedShapeSource` object. */ -extern MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionClusterRadius; +FOUNDATION_EXTERN MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionClusterRadius; /** An `NSNumber` object containing an integer; specifies the maximum zoom level at @@ -49,7 +49,7 @@ extern MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionClusterRadius; This option only affects point features within an `MGLShapeSource` object; it is ignored when creating an `MGLComputedShapeSource` object. */ -extern MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionMaximumZoomLevelForClustering; +FOUNDATION_EXTERN MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionMaximumZoomLevelForClustering; /** An `NSNumber` object containing an integer; specifies the minimum zoom level at @@ -59,7 +59,7 @@ extern MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionMaximumZoomLeve minzoom source property in the Mapbox Style Specification. */ -extern MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionMinimumZoomLevel; +FOUNDATION_EXTERN MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionMinimumZoomLevel; /** An `NSNumber` object containing an integer; specifies the maximum zoom level at @@ -70,7 +70,7 @@ extern MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionMinimumZoomLeve maxzoom source property in the Mapbox Style Specification. */ -extern MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionMaximumZoomLevel; +FOUNDATION_EXTERN MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionMaximumZoomLevel; /** An `NSNumber` object containing an integer; specifies the size of the tile @@ -82,7 +82,7 @@ extern MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionMaximumZoomLeve buffer source property in the Mapbox Style Specification. */ -extern MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionBuffer; +FOUNDATION_EXTERN MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionBuffer; /** An `NSNumber` object containing a double; specifies the Douglas-Peucker @@ -93,7 +93,7 @@ extern MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionBuffer; tolerance source property in the Mapbox Style Specification. */ -extern MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionSimplificationTolerance; +FOUNDATION_EXTERN MGL_EXPORT const MGLShapeSourceOption MGLShapeSourceOptionSimplificationTolerance; /** `MGLShapeSource` is a map content source that supplies vector shapes to be diff --git a/platform/darwin/src/MGLStyleValue.h b/platform/darwin/src/MGLStyleValue.h index 65f89c5909..2a90472b02 100644 --- a/platform/darwin/src/MGLStyleValue.h +++ b/platform/darwin/src/MGLStyleValue.h @@ -8,9 +8,9 @@ NS_ASSUME_NONNULL_BEGIN typedef NSString *MGLStyleFunctionOption NS_STRING_ENUM NS_UNAVAILABLE; -extern MGL_EXPORT const MGLStyleFunctionOption MGLStyleFunctionOptionInterpolationBase __attribute__((unavailable("Use NSExpression instead, applying the mgl_interpolate:withCurveType:parameters:stops: function with a curve type of “exponential” and a non-nil parameter."))); +FOUNDATION_EXTERN MGL_EXPORT const MGLStyleFunctionOption MGLStyleFunctionOptionInterpolationBase __attribute__((unavailable("Use NSExpression instead, applying the mgl_interpolate:withCurveType:parameters:stops: function with a curve type of “exponential” and a non-nil parameter."))); -extern MGL_EXPORT const MGLStyleFunctionOption MGLStyleFunctionOptionDefaultValue __attribute__((unavailable("Use +[NSExpression expressionForConditional:trueExpression:falseExpression:] instead."))); +FOUNDATION_EXTERN MGL_EXPORT const MGLStyleFunctionOption MGLStyleFunctionOptionDefaultValue __attribute__((unavailable("Use +[NSExpression expressionForConditional:trueExpression:falseExpression:] instead."))); typedef NS_ENUM(NSUInteger, MGLInterpolationMode) { MGLInterpolationModeExponential __attribute__((unavailable("Use NSExpression instead, applying the mgl_interpolate:withCurveType:parameters:stops: function with a curve type of “exponential”."))) = 0, diff --git a/platform/darwin/src/MGLTileSource.h b/platform/darwin/src/MGLTileSource.h index d55e72a1cb..0d8b118ec6 100644 --- a/platform/darwin/src/MGLTileSource.h +++ b/platform/darwin/src/MGLTileSource.h @@ -25,7 +25,7 @@ typedef NSString *MGLTileSourceOption NS_STRING_ENUM; TileJSON specification. */ -extern MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionMinimumZoomLevel; +FOUNDATION_EXTERN MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionMinimumZoomLevel; /** An `NSNumber` object containing an unsigned integer that specifies the maximum @@ -39,7 +39,7 @@ extern MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionMinimumZoomLevel; TileJSON specification. */ -extern MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionMaximumZoomLevel; +FOUNDATION_EXTERN MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionMaximumZoomLevel; /** An `NSValue` object containing an `MGLCoordinateBounds` struct that specifies @@ -53,7 +53,7 @@ extern MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionMaximumZoomLevel; TileJSON specification. */ -extern MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionCoordinateBounds; +FOUNDATION_EXTERN MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionCoordinateBounds; #if TARGET_OS_IPHONE /** @@ -69,7 +69,7 @@ extern MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionCoordinateBounds; TileJSON specification. */ -extern MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionAttributionHTMLString; +FOUNDATION_EXTERN MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionAttributionHTMLString; /** An array of `MGLAttributionInfo` objects defining the buttons to be displayed @@ -78,7 +78,7 @@ extern MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionAttributionHTMLSt By default, no attribution statements are displayed. */ -extern MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionAttributionInfos; +FOUNDATION_EXTERN MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionAttributionInfos; #else /** An HTML string defining the buttons to be displayed in the map view’s @@ -92,7 +92,7 @@ extern MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionAttributionInfos; TileJSON specification. */ -extern MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionAttributionHTMLString; +FOUNDATION_EXTERN MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionAttributionHTMLString; /** An array of `MGLAttributionInfo` objects defining the buttons to be displayed @@ -101,7 +101,7 @@ extern MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionAttributionHTMLSt By default, no attribution statements are displayed. */ -extern MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionAttributionInfos; +FOUNDATION_EXTERN MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionAttributionInfos; #endif /** @@ -115,7 +115,7 @@ extern MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionAttributionInfos; TileJSON specification. */ -extern MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionTileCoordinateSystem; +FOUNDATION_EXTERN MGL_EXPORT const MGLTileSourceOption MGLTileSourceOptionTileCoordinateSystem; /** Tile coordinate systems that determine how tile coordinates in tile URLs are diff --git a/platform/darwin/src/MGLTypes.h b/platform/darwin/src/MGLTypes.h index fbc3a43ea2..3abc116ad7 100644 --- a/platform/darwin/src/MGLTypes.h +++ b/platform/darwin/src/MGLTypes.h @@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN #endif /** Indicates an error occurred in the Mapbox SDK. */ -extern MGL_EXPORT NSErrorDomain const MGLErrorDomain; +FOUNDATION_EXTERN MGL_EXPORT NSErrorDomain const MGLErrorDomain; /** Error constants for the Mapbox SDK. */ typedef NS_ENUM(NSInteger, MGLErrorCode) { diff --git a/platform/darwin/src/NSExpression+MGLAdditions.h b/platform/darwin/src/NSExpression+MGLAdditions.h index cfdf27aade..d13f0227b4 100644 --- a/platform/darwin/src/NSExpression+MGLAdditions.h +++ b/platform/darwin/src/NSExpression+MGLAdditions.h @@ -18,7 +18,7 @@ typedef NSString *MGLExpressionInterpolationMode NS_TYPED_ENUM; interpolate expression operator in the Mapbox Style Specification. */ -extern MGL_EXPORT const MGLExpressionInterpolationMode MGLExpressionInterpolationModeLinear; +FOUNDATION_EXTERN MGL_EXPORT const MGLExpressionInterpolationMode MGLExpressionInterpolationModeLinear; /** An `NSString` identifying the `expotential` interpolation type in an `NSExpression`. @@ -27,7 +27,7 @@ extern MGL_EXPORT const MGLExpressionInterpolationMode MGLExpressionInterpolatio interpolate expression operator in the Mapbox Style Specification. */ -extern MGL_EXPORT const MGLExpressionInterpolationMode MGLExpressionInterpolationModeExponential; +FOUNDATION_EXTERN MGL_EXPORT const MGLExpressionInterpolationMode MGLExpressionInterpolationModeExponential; /** An `NSString` identifying the `cubic-bezier` interpolation type in an `NSExpression`. @@ -36,7 +36,7 @@ extern MGL_EXPORT const MGLExpressionInterpolationMode MGLExpressionInterpolatio interpolate expression operator in the Mapbox Style Specification. */ -extern MGL_EXPORT const MGLExpressionInterpolationMode MGLExpressionInterpolationModeCubicBezier; +FOUNDATION_EXTERN MGL_EXPORT const MGLExpressionInterpolationMode MGLExpressionInterpolationModeCubicBezier; /** Methods for creating expressions that use Mapbox-specific functionality and for diff --git a/platform/darwin/src/NSExpression+MGLPrivateAdditions.h b/platform/darwin/src/NSExpression+MGLPrivateAdditions.h index 656d78dd17..4ef49a2d15 100644 --- a/platform/darwin/src/NSExpression+MGLPrivateAdditions.h +++ b/platform/darwin/src/NSExpression+MGLPrivateAdditions.h @@ -79,6 +79,6 @@ NS_ASSUME_NONNULL_BEGIN @end -extern NSArray *MGLSubexpressionsWithJSONObjects(NSArray *objects); +FOUNDATION_EXTERN NSArray *MGLSubexpressionsWithJSONObjects(NSArray *objects); NS_ASSUME_NONNULL_END diff --git a/platform/ios/src/MGLMapView.h b/platform/ios/src/MGLMapView.h index b2439416ae..bfd0946cdc 100644 --- a/platform/ios/src/MGLMapView.h +++ b/platform/ios/src/MGLMapView.h @@ -24,13 +24,13 @@ NS_ASSUME_NONNULL_BEGIN @protocol MGLLocationManager; /** The default deceleration rate for a map view. */ -extern MGL_EXPORT const CGFloat MGLMapViewDecelerationRateNormal; +FOUNDATION_EXTERN MGL_EXPORT const CGFloat MGLMapViewDecelerationRateNormal; /** A fast deceleration rate for a map view. */ -extern MGL_EXPORT const CGFloat MGLMapViewDecelerationRateFast; +FOUNDATION_EXTERN MGL_EXPORT const CGFloat MGLMapViewDecelerationRateFast; /** Disables deceleration in a map view. */ -extern MGL_EXPORT const CGFloat MGLMapViewDecelerationRateImmediate; +FOUNDATION_EXTERN MGL_EXPORT const CGFloat MGLMapViewDecelerationRateImmediate; /** The vertical alignment of an annotation within a map view. Used with diff --git a/platform/ios/src/MGLMapView_Private.h b/platform/ios/src/MGLMapView_Private.h index 482ab55c5e..133d17023e 100644 --- a/platform/ios/src/MGLMapView_Private.h +++ b/platform/ios/src/MGLMapView_Private.h @@ -6,7 +6,7 @@ namespace mbgl { } /// Minimum size of an annotation’s accessibility element. -extern const CGSize MGLAnnotationAccessibilityElementMinimumSize; +FOUNDATION_EXTERN const CGSize MGLAnnotationAccessibilityElementMinimumSize; @interface MGLMapView (Private) -- cgit v1.2.1