summaryrefslogtreecommitdiff
path: root/include/mbgl/style/expression
diff options
context:
space:
mode:
Diffstat (limited to 'include/mbgl/style/expression')
-rw-r--r--include/mbgl/style/expression/find_zoom_curve.hpp4
-rw-r--r--include/mbgl/style/expression/interpolate.hpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/include/mbgl/style/expression/find_zoom_curve.hpp b/include/mbgl/style/expression/find_zoom_curve.hpp
index 6301938033..1e19436dd9 100644
--- a/include/mbgl/style/expression/find_zoom_curve.hpp
+++ b/include/mbgl/style/expression/find_zoom_curve.hpp
@@ -11,9 +11,9 @@ namespace mbgl {
namespace style {
namespace expression {
-optional<variant<const InterpolateBase*, const Step*, ParsingError>> findZoomCurve(const expression::Expression* e);
+optional<variant<const Interpolate*, const Step*, ParsingError>> findZoomCurve(const expression::Expression* e);
-variant<const InterpolateBase*, const Step*> findZoomCurveChecked(const expression::Expression* e);
+variant<const Interpolate*, const Step*> findZoomCurveChecked(const expression::Expression* e);
} // namespace expression
} // namespace style
diff --git a/include/mbgl/style/expression/interpolate.hpp b/include/mbgl/style/expression/interpolate.hpp
index dcdfa302ba..0e7682007f 100644
--- a/include/mbgl/style/expression/interpolate.hpp
+++ b/include/mbgl/style/expression/interpolate.hpp
@@ -16,9 +16,9 @@ namespace expression {
ParseResult parseInterpolate(const mbgl::style::conversion::Convertible& value, ParsingContext& ctx);
-class InterpolateBase : public Expression {
+class Interpolate : public Expression {
public:
- InterpolateBase(const type::Type& type_,
+ Interpolate(const type::Type& type_,
Interpolator interpolator_,
std::unique_ptr<Expression> input_,
std::map<double, std::unique_ptr<Expression>> stops_
@@ -56,7 +56,7 @@ public:
}
bool operator==(const Expression& e) const override {
- if (auto rhs = dynamic_cast<const InterpolateBase*>(&e)) {
+ if (auto rhs = dynamic_cast<const Interpolate*>(&e)) {
if (interpolator != rhs->interpolator ||
*input != *(rhs->input) ||
stops.size() != rhs->stops.size())