diff options
Diffstat (limited to 'src/mbgl/style/expression/is_expression.cpp')
-rw-r--r-- | src/mbgl/style/expression/is_expression.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mbgl/style/expression/is_expression.cpp b/src/mbgl/style/expression/is_expression.cpp index acf074c25b..34f0fec7a3 100644 --- a/src/mbgl/style/expression/is_expression.cpp +++ b/src/mbgl/style/expression/is_expression.cpp @@ -12,13 +12,11 @@ namespace expression { using namespace mbgl::style::conversion; bool isExpression(const Convertible& value) { - const ExpressionRegistry& registry = getExpressionRegistry(); - if (!isArray(value) || arrayLength(value) == 0) return false; optional<std::string> name = toString(arrayMember(value, 0)); if (!name) return false; - return (registry.find(*name) != registry.end()) || + return getExpression(*name) || (CompoundExpressionRegistry::definitions.find(*name) != CompoundExpressionRegistry::definitions.end()); } |