[ios, osx] Fixed Xcode 7.3 build

Fixed a compiler error that’s new in Xcode 7.3. Also corrected a typo in MGLMapView on OS X.
This commit is contained in:
Minh Nguyễn
2016-01-11 14:21:15 -08:00
committed by Minh Nguyễn
parent c10f6489e6
commit 5eaf7a6211
3 changed files with 4 additions and 4 deletions

View File

@@ -69,7 +69,7 @@ IB_DESIGNABLE
@param frame The frame for the view, measured in points.
@return An initialized map view. */
- (instancetype)initWithFrame:(CGRect)frame;
- (instancetype)initWithFrame:(NSRect)frame;
/** Initializes and returns a newly allocated map view with the specified frame
and style URL.
@@ -80,7 +80,7 @@ IB_DESIGNABLE
(`mapbox://styles/<user>/<style>`), or a path to a local file relative
to the application’s resource path. Specify `nil` for the default style.
@return An initialized map view. */
- (instancetype)initWithFrame:(CGRect)frame styleURL:(nullable NSURL *)styleURL;
- (instancetype)initWithFrame:(NSRect)frame styleURL:(nullable NSURL *)styleURL;
#pragma mark Accessing the delegate
/** @name Accessing the Delegate */

View File

@@ -95,7 +95,7 @@
- (NSString *)description
{
return [NSString stringWithFormat:@"<%@ %p centerCoordinate:%f, %f altitude:%.0fm heading:%.0f° pitch:%.0f°>",
NSStringFromClass([self class]), self, _centerCoordinate.latitude, _centerCoordinate.longitude, _altitude, _heading, _pitch];
NSStringFromClass([self class]), (void *)self, _centerCoordinate.latitude, _centerCoordinate.longitude, _altitude, _heading, _pitch];
}
- (BOOL)isEqual:(id)other

View File

@@ -200,7 +200,7 @@ public:
return self;
}
- (instancetype)initWithFrame:(CGRect)frame styleURL:(nullable NSURL *)styleURL {
- (instancetype)initWithFrame:(NSRect)frame styleURL:(nullable NSURL *)styleURL {
if (self = [super initWithFrame:frame]) {
[self commonInit];
self.styleURL = styleURL;