diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2016-12-15 21:14:17 -0800 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2016-12-16 07:58:48 -0800 |
commit | b8466946e5eac5a4359206c19fe6e659ae9cf6c1 (patch) | |
tree | de8e2c97fdefc48238be28e8e5f10a9c524b05f3 /platform | |
parent | 74f39c0120844e5c08feb05907fcc19a653a8b4d (diff) | |
download | qtlocation-mapboxgl-b8466946e5eac5a4359206c19fe6e659ae9cf6c1.tar.gz |
[ios, macos] Corrected return type of MGLShape factory method
Diffstat (limited to 'platform')
-rw-r--r-- | platform/darwin/src/MGLShape.h | 2 | ||||
-rw-r--r-- | platform/darwin/src/MGLShape.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/darwin/src/MGLShape.h b/platform/darwin/src/MGLShape.h index e7dbe90242..af815da0e9 100644 --- a/platform/darwin/src/MGLShape.h +++ b/platform/darwin/src/MGLShape.h @@ -33,7 +33,7 @@ NS_ASSUME_NONNULL_BEGIN not be parsed as valid GeoJSON source code. If `nil`, `outError` contains an `NSError` object describing the problem. */ -+ (nullable instancetype)shapeWithData:(NSData *)data encoding:(NSStringEncoding)encoding error:(NSError * _Nullable *)outError; ++ (nullable MGLShape *)shapeWithData:(NSData *)data encoding:(NSStringEncoding)encoding error:(NSError * _Nullable *)outError; #pragma mark Accessing the Shape Attributes diff --git a/platform/darwin/src/MGLShape.mm b/platform/darwin/src/MGLShape.mm index 93a3b37e93..889ef8b3d7 100644 --- a/platform/darwin/src/MGLShape.mm +++ b/platform/darwin/src/MGLShape.mm @@ -4,7 +4,7 @@ @implementation MGLShape -+ (nullable instancetype)shapeWithData:(NSData *)data encoding:(NSStringEncoding)encoding error:(NSError * _Nullable *)outError { ++ (nullable MGLShape *)shapeWithData:(NSData *)data encoding:(NSStringEncoding)encoding error:(NSError * _Nullable *)outError { NSString *string = [[NSString alloc] initWithData:data encoding:encoding]; if (!string) { if (outError) { |