[ios, macos] Fixed nilling out predicate

This commit is contained in:
Minh Nguyễn
2017-01-12 14:17:20 -08:00
committed by Minh Nguyễn
parent 0a1987f091
commit 85fc75db8d
5 changed files with 6 additions and 6 deletions

View File

@@ -80,7 +80,7 @@ namespace mbgl {
{
MGLAssertStyleLayerIsValid();
self.rawLayer->setFilter(predicate.mgl_filter);
self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::NullFilter());
}
- (NSPredicate *)predicate

View File

@@ -75,7 +75,7 @@ namespace mbgl {
{
MGLAssertStyleLayerIsValid();
self.rawLayer->setFilter(predicate.mgl_filter);
self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::NullFilter());
}
- (NSPredicate *)predicate

View File

@@ -87,7 +87,7 @@ namespace mbgl {
{
MGLAssertStyleLayerIsValid();
self.rawLayer->setFilter(predicate.mgl_filter);
self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::NullFilter());
}
- (NSPredicate *)predicate

View File

@@ -117,7 +117,7 @@ namespace mbgl {
{
MGLAssertStyleLayerIsValid();
self.rawLayer->setFilter(predicate.mgl_filter);
self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::NullFilter());
}
- (NSPredicate *)predicate
@@ -260,4 +260,4 @@ namespace mbgl {
<% } -%>
@end
<% } -%>
<% } -%>

View File

@@ -134,7 +134,7 @@ namespace mbgl {
{
MGLAssertStyleLayerIsValid();
self.rawLayer->setFilter(predicate.mgl_filter);
self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::NullFilter());
}
- (NSPredicate *)predicate