diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2016-12-19 00:24:20 -0800 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2016-12-23 15:17:03 -0800 |
commit | a66b1f7599bba67dce669b000a7d37d61010377f (patch) | |
tree | c9e39c09c8f80ebf02a059aa390ac0128e3f835e /platform | |
parent | b134215895af5c2b94bb966e5b3f234679661c21 (diff) | |
download | qtlocation-mapboxgl-a66b1f7599bba67dce669b000a7d37d61010377f.tar.gz |
[ios, macos] Fixed iosbench build
Fixed a stale include in iosbench. MGLMapView(Private) forward-declares mbgl::Map instead of including mbgl.hpp, which iosbench has no access to.
Diffstat (limited to 'platform')
-rw-r--r-- | platform/darwin/src/MGLRasterSource.mm | 1 | ||||
-rw-r--r-- | platform/darwin/src/MGLShapeSource.mm | 1 | ||||
-rw-r--r-- | platform/darwin/src/MGLStyleLayer_Private.h | 1 | ||||
-rw-r--r-- | platform/darwin/src/MGLVectorSource.mm | 1 | ||||
-rw-r--r-- | platform/ios/benchmark/MBXBenchViewController.mm | 2 | ||||
-rw-r--r-- | platform/ios/src/MGLMapView_Private.h | 6 | ||||
-rw-r--r-- | platform/macos/src/MGLMapView_Private.h | 4 |
7 files changed, 12 insertions, 4 deletions
diff --git a/platform/darwin/src/MGLRasterSource.mm b/platform/darwin/src/MGLRasterSource.mm index 9f57bb10a3..dbcba85d91 100644 --- a/platform/darwin/src/MGLRasterSource.mm +++ b/platform/darwin/src/MGLRasterSource.mm @@ -5,6 +5,7 @@ #import "MGLTileSource_Private.h" #import "NSURL+MGLAdditions.h" +#include <mbgl/mbgl.hpp> #include <mbgl/style/sources/raster_source.hpp> const MGLTileSourceOption MGLTileSourceOptionTileSize = @"MGLTileSourceOptionTileSize"; diff --git a/platform/darwin/src/MGLShapeSource.mm b/platform/darwin/src/MGLShapeSource.mm index d062e656c2..0647236e80 100644 --- a/platform/darwin/src/MGLShapeSource.mm +++ b/platform/darwin/src/MGLShapeSource.mm @@ -7,6 +7,7 @@ #import "NSURL+MGLAdditions.h" +#include <mbgl/mbgl.hpp> #include <mbgl/style/sources/geojson_source.hpp> const MGLShapeSourceOption MGLShapeSourceOptionClustered = @"MGLShapeSourceOptionClustered"; diff --git a/platform/darwin/src/MGLStyleLayer_Private.h b/platform/darwin/src/MGLStyleLayer_Private.h index 8f1cdfb4a1..c5e3e76549 100644 --- a/platform/darwin/src/MGLStyleLayer_Private.h +++ b/platform/darwin/src/MGLStyleLayer_Private.h @@ -3,6 +3,7 @@ #import "MGLStyleLayer.h" #import "MGLStyleValue_Private.h" +#include <mbgl/mbgl.hpp> #include <mbgl/style/layer.hpp> NS_ASSUME_NONNULL_BEGIN diff --git a/platform/darwin/src/MGLVectorSource.mm b/platform/darwin/src/MGLVectorSource.mm index 3ec54ac094..c95ff63bbf 100644 --- a/platform/darwin/src/MGLVectorSource.mm +++ b/platform/darwin/src/MGLVectorSource.mm @@ -5,6 +5,7 @@ #import "MGLTileSource_Private.h" #import "NSURL+MGLAdditions.h" +#include <mbgl/mbgl.hpp> #include <mbgl/style/sources/vector_source.hpp> @interface MGLVectorSource () diff --git a/platform/ios/benchmark/MBXBenchViewController.mm b/platform/ios/benchmark/MBXBenchViewController.mm index 43e98d7ccd..4f26d0cb1d 100644 --- a/platform/ios/benchmark/MBXBenchViewController.mm +++ b/platform/ios/benchmark/MBXBenchViewController.mm @@ -3,7 +3,7 @@ #import "MBXBenchAppDelegate.h" #import <Mapbox/Mapbox.h> -#import "MGLMapView_Internal.h" +#import "MGLMapView_Private.h" #include "locations.hpp" diff --git a/platform/ios/src/MGLMapView_Private.h b/platform/ios/src/MGLMapView_Private.h index 5c74ba6dc8..4e2765377c 100644 --- a/platform/ios/src/MGLMapView_Private.h +++ b/platform/ios/src/MGLMapView_Private.h @@ -1,11 +1,13 @@ #import <Mapbox/Mapbox.h> -#include <mbgl/mbgl.hpp> +namespace mbgl { + class Map; +} /// Minimum size of an annotation’s accessibility element. extern const CGSize MGLAnnotationAccessibilityElementMinimumSize; -@interface MGLMapView (Internal) +@interface MGLMapView (Private) /// Currently shown popover representing the selected annotation. @property (nonatomic) UIView<MGLCalloutView> *calloutViewForSelectedAnnotation; diff --git a/platform/macos/src/MGLMapView_Private.h b/platform/macos/src/MGLMapView_Private.h index f0a61773a9..5ac75768a1 100644 --- a/platform/macos/src/MGLMapView_Private.h +++ b/platform/macos/src/MGLMapView_Private.h @@ -1,6 +1,8 @@ #import "MGLMapView.h" -#import <mbgl/mbgl.hpp> +namespace mbgl { + class Map; +} @interface MGLMapView (Private) |