diff options
| author | Jason Wray <jason@mapbox.com> | 2018-07-19 14:09:49 -0400 |
|---|---|---|
| committer | Jason Wray <jason@mapbox.com> | 2018-07-24 18:14:27 -0400 |
| commit | 4205cf7b10b63d834cd3e0e24e8ae5dc4b8948f9 (patch) | |
| tree | 856fff014151eeb611db62acb91bc6d044e482cb | |
| parent | f149951f0f6b7babbaad02184027597c7d047144 (diff) | |
| download | qtlocation-mapboxgl-4205cf7b10b63d834cd3e0e24e8ae5dc4b8948f9.tar.gz | |
[ios] Fix symbol mangling issue with MGLMapPointForCoordinate()
`MGLMapPointForCoordinate()` was `extern`-defined in a C header, but implemented in an Obj-C++ source file and mangled as a C++ symbol. `FOUNDATION_EXTERN` is C++-aware and will force C-style symbol mangling, which fixes the undefined symbol issue in consumer Obj-C projects.
| -rw-r--r-- | platform/darwin/src/MGLGeometry.h | 4 | ||||
| -rw-r--r-- | platform/ios/CHANGELOG.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/platform/darwin/src/MGLGeometry.h b/platform/darwin/src/MGLGeometry.h index a8d3759106..50474a7ba5 100644 --- a/platform/darwin/src/MGLGeometry.h +++ b/platform/darwin/src/MGLGeometry.h @@ -64,7 +64,7 @@ NS_INLINE BOOL MGLCoordinateSpanEqualToCoordinateSpan(MGLCoordinateSpan span1, M } /** An area of zero width and zero height. */ -extern MGL_EXPORT const MGLCoordinateSpan MGLCoordinateSpanZero; +FOUNDATION_EXTERN MGL_EXPORT const MGLCoordinateSpan MGLCoordinateSpanZero; /** A rectangular area as measured on a two-dimensional map projection. */ typedef struct __attribute__((objc_boxable)) MGLCoordinateBounds { @@ -211,6 +211,6 @@ NS_INLINE CLLocationDegrees MGLDegreesFromRadians(CGFloat radians) { } /** Returns Mercator projection of a WGS84 coordinate at the specified zoom level. */ -extern MGL_EXPORT MGLMapPoint MGLMapPointForCoordinate(CLLocationCoordinate2D coordinate, double zoomLevel); +FOUNDATION_EXTERN MGL_EXPORT MGLMapPoint MGLMapPointForCoordinate(CLLocationCoordinate2D coordinate, double zoomLevel); NS_ASSUME_NONNULL_END diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md index 08fc156f91..55375eb0eb 100644 --- a/platform/ios/CHANGELOG.md +++ b/platform/ios/CHANGELOG.md @@ -10,7 +10,7 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT * Token string syntax (`"{token}"`) in `MGLSymbolStyleLayer` `text` and `iconImageName` properties is now correctly converted to the appropriate `NSExpression` equivalent. ([#11659](https://github.com/mapbox/mapbox-gl-native/issues/11659)) * Added an `MGLMapView.locationManager` property and `MGLLocationManager` protocol for tracking user location using a custom alternative to `CLLocationManager`. ([#12013](https://github.com/mapbox/mapbox-gl-native/pull/12013)) * Fixed a crash when switching between two styles having layers with the same identifier but different layer types. ([#12432](https://github.com/mapbox/mapbox-gl-native/issues/12432)) - +* Fixed an issue where the symbols for `MGLMapPointForCoordinate` could not be found. ([#12445](https://github.com/mapbox/mapbox-gl-native/issues/12445)) ## 4.2.0 - July 18, 2018 |