summaryrefslogtreecommitdiff
path: root/include/mbgl/style/property_expression.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'include/mbgl/style/property_expression.hpp')
-rw-r--r--include/mbgl/style/property_expression.hpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/include/mbgl/style/property_expression.hpp b/include/mbgl/style/property_expression.hpp
index 16f154cdf2..b198de02b2 100644
--- a/include/mbgl/style/property_expression.hpp
+++ b/include/mbgl/style/property_expression.hpp
@@ -14,16 +14,9 @@ namespace style {
template <class T>
class PropertyExpression {
public:
- PropertyExpression(std::unique_ptr<expression::Expression> expression_)
- : isExpression(true),
- expression(std::move(expression_)),
- zoomCurve(expression::findZoomCurveChecked(expression.get())) {
- }
-
- // To be used only for conversions from legacy functions.
- PropertyExpression(std::unique_ptr<expression::Expression> expression_, optional<T> defaultValue_)
- : isExpression(false),
- expression(std::move(expression_)),
+ // Second parameter to be used only for conversions from legacy functions.
+ PropertyExpression(std::unique_ptr<expression::Expression> expression_, optional<T> defaultValue_ = {})
+ : expression(std::move(expression_)),
defaultValue(std::move(defaultValue_)),
zoomCurve(expression::findZoomCurveChecked(expression.get())) {
}
@@ -108,7 +101,6 @@ public:
const expression::Expression& getExpression() const { return *expression; }
bool useIntegerZoom = false;
- bool isExpression;
friend bool operator==(const PropertyExpression& lhs,
const PropertyExpression& rhs) {