diff options
| author | Randall Lee <randall.lee@mapbox.com> | 2018-05-22 14:09:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-22 14:09:36 -0400 |
| commit | d858cb783b499a1cc77b48a0faee137ca5e6a423 (patch) | |
| tree | 5c36c353730e3050d44e472545519c0429723266 /platform/darwin/src/MGLHeatmapStyleLayer.mm | |
| parent | f93d722458be62d567aa152711a014ef51a90193 (diff) | |
| parent | 60505b03174b5ec02ae723beafa7683f6ed54a62 (diff) | |
| download | qtlocation-mapboxgl-upstream/rclee-async-setup.tar.gz | |
Merge branch 'master' into rclee-async-setupupstream/rclee-async-setup
Diffstat (limited to 'platform/darwin/src/MGLHeatmapStyleLayer.mm')
| -rw-r--r-- | platform/darwin/src/MGLHeatmapStyleLayer.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/darwin/src/MGLHeatmapStyleLayer.mm b/platform/darwin/src/MGLHeatmapStyleLayer.mm index a394dbda3b..925b3ac750 100644 --- a/platform/darwin/src/MGLHeatmapStyleLayer.mm +++ b/platform/darwin/src/MGLHeatmapStyleLayer.mm @@ -2,7 +2,7 @@ // Edit platform/darwin/scripts/generate-style-code.js, then run `make darwin-style-code`. #import "MGLSource.h" -#import "NSPredicate+MGLAdditions.h" +#import "NSPredicate+MGLPrivateAdditions.h" #import "NSDate+MGLAdditions.h" #import "MGLStyleLayer_Private.h" #import "MGLStyleValue_Private.h" @@ -56,7 +56,7 @@ { MGLAssertStyleLayerIsValid(); - self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::NullFilter()); + self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::Filter()); } - (NSPredicate *)predicate |