Switch back to a shared_ptr per chat with @anandthakker

3 files changed, 4 insertions, 4 deletions

diff --git a/include/mbgl/style/filter.hpp b/include/mbgl/style/filter.hpp
index 99a5426c2b..040f7808a7 100644
--- a/include/mbgl/style/filter.hpp
+++ b/include/mbgl/style/filter.hpp
@@ -236,10 +236,10 @@ public:
     
 class ExpressionFilter {
 public:
-    expression::Expression &expression;
+    std::shared_ptr<expression::Expression> expression;
     
     friend bool operator==(const ExpressionFilter& lhs, const ExpressionFilter& rhs) {
-        return lhs.expression == rhs.expression;
+        return *(lhs.expression) == *(rhs.expression);
     }
 };
 
diff --git a/src/mbgl/style/conversion/stringify.hpp b/src/mbgl/style/conversion/stringify.hpp
index 0d1d4d85fb..7924a442c4 100644
--- a/src/mbgl/style/conversion/stringify.hpp
+++ b/src/mbgl/style/conversion/stringify.hpp
@@ -227,7 +227,7 @@ public:
     }
     
     void operator()(const ExpressionFilter& filter) {
-        stringify(writer, filter.expression.serialize());
+        stringify(writer, filter.expression->serialize());
     }
 
 private:
diff --git a/src/mbgl/style/filter_evaluator.cpp b/src/mbgl/style/filter_evaluator.cpp
index 39f356a8b1..72022172f4 100644
--- a/src/mbgl/style/filter_evaluator.cpp
+++ b/src/mbgl/style/filter_evaluator.cpp
@@ -213,7 +213,7 @@ bool FilterEvaluator::operator()(const NotHasIdentifierFilter&) const {
 }
 
 bool FilterEvaluator::operator()(const ExpressionFilter& filter) const {
-    const expression::EvaluationResult result = filter.expression.evaluate(context);
+    const expression::EvaluationResult result = filter.expression->evaluate(context);
     if (result) {
         const optional<bool> typed = expression::fromExpressionValue<bool>(*result);
         return typed ? *typed : false;