diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2018-01-05 12:40:54 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-01-10 15:31:12 -0800 |
| commit | 76ed5079a547e9f98616a9401c8814d224cec9d8 (patch) | |
| tree | 4bad1bcefd0744a0262d6973b825a977fa2cfe45 /include/mbgl/style/expression/boolean_operator.hpp | |
| parent | 158bd5e08cae5974a9c587677d7d8e63a36a5ff0 (diff) | |
| download | qtlocation-mapboxgl-76ed5079a547e9f98616a9401c8814d224cec9d8.tar.gz | |
[core, ios, macos, android] Add data-driven-styling support for `text-font`
Diffstat (limited to 'include/mbgl/style/expression/boolean_operator.hpp')
| -rw-r--r-- | include/mbgl/style/expression/boolean_operator.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/mbgl/style/expression/boolean_operator.hpp b/include/mbgl/style/expression/boolean_operator.hpp index 01231d706b..115a096665 100644 --- a/include/mbgl/style/expression/boolean_operator.hpp +++ b/include/mbgl/style/expression/boolean_operator.hpp @@ -2,6 +2,7 @@ #include <mbgl/style/expression/expression.hpp> #include <mbgl/style/conversion.hpp> + #include <memory> namespace mbgl { @@ -20,6 +21,7 @@ public: EvaluationResult evaluate(const EvaluationContext& params) const override; void eachChild(const std::function<void(const Expression&)>& visit) const override; bool operator==(const Expression& e) const override; + std::vector<optional<Value>> possibleOutputs() const override; private: std::vector<std::unique_ptr<Expression>> inputs; @@ -36,8 +38,8 @@ public: EvaluationResult evaluate(const EvaluationContext& params) const override; void eachChild(const std::function<void(const Expression&)>& visit) const override; - bool operator==(const Expression& e) const override; + std::vector<optional<Value>> possibleOutputs() const override; private: std::vector<std::unique_ptr<Expression>> inputs; @@ -46,4 +48,3 @@ private: } // namespace expression } // namespace style } // namespace mbgl - |