summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas Wojciechowski <lucas@mapbox.com>2018-02-20 10:18:55 -0800
committerLucas Wojciechowski <lucas@mapbox.com>2018-02-20 10:18:55 -0800
commit7b533ac6a08b852d21644159cd7cf8cb9241d788 (patch)
tree18cee063fb3dc76309354e10c99a805dd99f57d6
parent1352b1ddfa6606b98e616ce50e391839bf06203a (diff)
downloadqtlocation-mapboxgl-7b533ac6a08b852d21644159cd7cf8cb9241d788.tar.gz
Replace `shared_ptr` with &reference
-rw-r--r--include/mbgl/style/filter.hpp2
-rw-r--r--src/mbgl/style/filter_evaluator.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/mbgl/style/filter.hpp b/include/mbgl/style/filter.hpp
index a5bd32b71e..99a5426c2b 100644
--- a/include/mbgl/style/filter.hpp
+++ b/include/mbgl/style/filter.hpp
@@ -236,7 +236,7 @@ public:
class ExpressionFilter {
public:
- std::shared_ptr<expression::Expression> expression;
+ expression::Expression &expression;
friend bool operator==(const ExpressionFilter& lhs, const ExpressionFilter& rhs) {
return lhs.expression == rhs.expression;
diff --git a/src/mbgl/style/filter_evaluator.cpp b/src/mbgl/style/filter_evaluator.cpp
index 72022172f4..39f356a8b1 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;