tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Fix performance-no-automatic-move (bonus)

Browse Source 
As reported by clang-tidy-10. We don't run clang-tidy-10 yet. We
should probably consider moving the bots at some point so errors
like this won't return.
This commit is contained in:
Thiago Marcos P. Santos
2020-03-27 18:30:35 +02:00
parent cc8b0e1746
commit ea2477f2ea
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/mbgl/actor/scheduler.hpp
View File

@@ -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); };

4
include/mbgl/style/expression/let.hpp
View File

@@ -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&);

3
include/mbgl/style/expression/literal.hpp
View File

@@ -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;

2
src/mbgl/layout/symbol_layout.cpp
View File

@@ -371,7 +371,7 @@ void SymbolLayout::prepareSymbols(const GlyphMap& glyphMap,
WritingModeType writingMode,
SymbolAnchorType textAnchor,
TextJustifyType textJustify) {
const Shaping result = getShaping(
Shaping result = getShaping(
/* string */ formattedText,
/* maxWidth: ems */
isPointPlacement ? layout->evaluate<TextMaxWidth>(zoom, feature, canonicalID) * util::ONE_EM : 0.0f,

4
src/mbgl/style/expression/boolean_operator.cpp
View File

@@ -7,7 +7,7 @@ namespace expression {
EvaluationResult Any::evaluate(const EvaluationContext& params) const {
for (const auto& input : inputs) {
const EvaluationResult result = input->evaluate(params);
EvaluationResult result = input->evaluate(params);
if (!result) return result;
if (result->get<bool>()) return EvaluationResult(true);
}
@@ -35,7 +35,7 @@ std::vector<optional<Value>> Any::possibleOutputs() const {
EvaluationResult All::evaluate(const EvaluationContext& params) const {
for (const auto& input : inputs) {
const EvaluationResult result = input->evaluate(params);
EvaluationResult result = input->evaluate(params);
if (!result) return result;
if (!result->get<bool>()) return EvaluationResult(false);
}

2
src/mbgl/style/expression/length.cpp
View File

@@ -12,7 +12,7 @@ Length::Length(std::unique_ptr<Expression> input_)
}
EvaluationResult Length::evaluate(const EvaluationContext& params) const {
const EvaluationResult value = input->evaluate(params);
EvaluationResult value = input->evaluate(params);
if (!value) return value;
return value->match(
[] (const std::string& s) {