diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/mbgl/actor/scheduler.hpp | 4 | ||||
-rw-r--r-- | include/mbgl/style/expression/let.hpp | 4 | ||||
-rw-r--r-- | include/mbgl/style/expression/literal.hpp | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/include/mbgl/actor/scheduler.hpp b/include/mbgl/actor/scheduler.hpp index 1a9ba1907f..dbc1a94f47 100644 --- a/include/mbgl/actor/scheduler.hpp +++ b/include/mbgl/actor/scheduler.hpp @@ -90,8 +90,8 @@ protected: template <typename TaskFn, typename ReplyFn> void scheduleAndReplyValue(const TaskFn& task, const ReplyFn& reply, - const mapbox::base::WeakPtr<Scheduler>& replyScheduler) { - auto scheduled = [replyScheduler, task, reply] { + mapbox::base::WeakPtr<Scheduler> replyScheduler) { + auto scheduled = [replyScheduler = std::move(replyScheduler), task, reply] { auto lock = replyScheduler.lock(); if (!replyScheduler) return; auto scheduledReply = [reply, result = task()] { reply(result); }; diff --git a/include/mbgl/style/expression/let.hpp b/include/mbgl/style/expression/let.hpp index 7c468dfeb1..a03c4b7d70 100644 --- a/include/mbgl/style/expression/let.hpp +++ b/include/mbgl/style/expression/let.hpp @@ -49,8 +49,8 @@ private: class Var : public Expression { public: - Var(std::string name_, const std::shared_ptr<Expression>& value_) - : Expression(Kind::Var, value_->getType()), name(std::move(name_)), value(value_) {} + Var(std::string name_, std::shared_ptr<Expression> value_) + : Expression(Kind::Var, value_->getType()), name(std::move(name_)), value(std::move(value_)) {} static ParseResult parse(const mbgl::style::conversion::Convertible&, ParsingContext&); diff --git a/include/mbgl/style/expression/literal.hpp b/include/mbgl/style/expression/literal.hpp index f704a34a59..e8f0a5d9ee 100644 --- a/include/mbgl/style/expression/literal.hpp +++ b/include/mbgl/style/expression/literal.hpp @@ -14,7 +14,8 @@ class Literal : public Expression { public: Literal(const Value& value_) : Expression(Kind::Literal, typeOf(value_)), value(value_) {} - Literal(const type::Array& type_, std::vector<Value> value_) : Expression(Kind::Literal, type_), value(value_) {} + Literal(const type::Array& type_, std::vector<Value> value_) + : Expression(Kind::Literal, type_), value(std::move(value_)) {} EvaluationResult evaluate(const EvaluationContext&) const override { return value; |