diff options
author | Justin R. Miller <incanus@codesorcery.net> | 2016-10-18 14:33:25 -0700 |
---|---|---|
committer | Justin R. Miller <incanus@codesorcery.net> | 2016-10-18 14:33:25 -0700 |
commit | cc75209ce4553212f3442692b1123e4c6fd85ff2 (patch) | |
tree | e99dc62c90be3458b61766e9db529ddc627cecc5 /platform/darwin/src/NSExpression+MGLAdditions.h | |
parent | b0c6eb309e76cf06a8fdef1316abbe07bb0f2f74 (diff) | |
parent | 0ccc7f51ba1d3377b93b4dddc3a4a03d0fda2260 (diff) | |
download | qtlocation-mapboxgl-cc75209ce4553212f3442692b1123e4c6fd85ff2.tar.gz |
Merge remote-tracking branch 'origin/master' into smooth-camera
Diffstat (limited to 'platform/darwin/src/NSExpression+MGLAdditions.h')
-rw-r--r-- | platform/darwin/src/NSExpression+MGLAdditions.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/darwin/src/NSExpression+MGLAdditions.h b/platform/darwin/src/NSExpression+MGLAdditions.h index 4e8c5ee071..6d0fff5760 100644 --- a/platform/darwin/src/NSExpression+MGLAdditions.h +++ b/platform/darwin/src/NSExpression+MGLAdditions.h @@ -5,7 +5,7 @@ @interface NSExpression (MGLAdditions) - (mbgl::Value)mgl_filterValue; - - (std::vector<mbgl::Value>)mgl_filterValues; +- (mbgl::FeatureIdentifier)mgl_featureIdentifier; @end |