diff options
author | zmiao <miao.zhao@mapbox.com> | 2019-10-08 22:11:40 +0300 |
---|---|---|
committer | zmiao <miao.zhao@mapbox.com> | 2019-10-08 22:11:40 +0300 |
commit | e7ad9f588d94485d7294bc5afcf6814d5b96349f (patch) | |
tree | 65d37371d60d3d58b0306d18ed653cd205cf4c39 | |
parent | 56167c4daf2d15c23fdf7dba4078e448366fcb91 (diff) | |
download | qtlocation-mapboxgl-e7ad9f588d94485d7294bc5afcf6814d5b96349f.tar.gz |
[ios] Remove inline keyword
-rw-r--r-- | platform/darwin/src/MGLStyleValue.mm | 13 | ||||
-rw-r--r-- | platform/darwin/src/MGLStyleValue_Private.h | 12 |
2 files changed, 14 insertions, 11 deletions
diff --git a/platform/darwin/src/MGLStyleValue.mm b/platform/darwin/src/MGLStyleValue.mm index 5103b5f5cf..01ad108d7f 100644 --- a/platform/darwin/src/MGLStyleValue.mm +++ b/platform/darwin/src/MGLStyleValue.mm @@ -44,3 +44,16 @@ id MGLJSONObjectFromMBGLValue(const mbgl::Value &value) { id MGLJSONObjectFromMBGLExpression(const mbgl::style::expression::Expression &mbglExpression) { return MGLJSONObjectFromMBGLValue(mbglExpression.serialize()); } + + +std::unique_ptr<mbgl::style::expression::Expression> MGLClusterPropertyFromNSExpression(NSExpression *expression) { + if (!expression) { + return nullptr; + } + + NSArray *jsonExpression = expression.mgl_jsonExpressionObject; + + auto expr = mbgl::style::expression::dsl::createExpression(mbgl::style::conversion::makeConvertible(jsonExpression)); + + return expr; +} diff --git a/platform/darwin/src/MGLStyleValue_Private.h b/platform/darwin/src/MGLStyleValue_Private.h index 4c25ea8c31..82ce232c6b 100644 --- a/platform/darwin/src/MGLStyleValue_Private.h +++ b/platform/darwin/src/MGLStyleValue_Private.h @@ -48,17 +48,7 @@ NS_INLINE mbgl::style::TransitionOptions MGLOptionsFromTransition(MGLTransition return options; } -NS_INLINE std::unique_ptr<mbgl::style::expression::Expression> MGLClusterPropertyFromNSExpression(NSExpression *expression) { - if (!expression) { - return nullptr; - } - - NSArray *jsonExpression = expression.mgl_jsonExpressionObject; - - auto expr = mbgl::style::expression::dsl::createExpression(mbgl::style::conversion::makeConvertible(jsonExpression)); - - return expr; -} +std::unique_ptr<mbgl::style::expression::Expression> MGLClusterPropertyFromNSExpression(NSExpression *expression); id MGLJSONObjectFromMBGLExpression(const mbgl::style::expression::Expression &mbglExpression); |