summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnand Thakker <github@anandthakker.net>2017-10-26 22:44:32 -0400
committerAnand Thakker <github@anandthakker.net>2017-10-26 22:44:32 -0400
commit94febc544b7cdb29355de23724f10973a7155cc0 (patch)
treebe92fac0633a2fbe94041dea0a9b909ac868a015
parent1c861151264fe1d71b3be3774d147eeb76b84aa9 (diff)
downloadqtlocation-mapboxgl-94febc544b7cdb29355de23724f10973a7155cc0.tar.gz
eachChild lambda parameter => const reference
-rw-r--r--include/mbgl/style/expression/array_assertion.hpp2
-rw-r--r--include/mbgl/style/expression/assertion.hpp2
-rw-r--r--include/mbgl/style/expression/at.hpp2
-rw-r--r--include/mbgl/style/expression/boolean_operator.hpp4
-rw-r--r--include/mbgl/style/expression/case.hpp2
-rw-r--r--include/mbgl/style/expression/coalesce.hpp2
-rw-r--r--include/mbgl/style/expression/coercion.hpp2
-rw-r--r--include/mbgl/style/expression/compound_expression.hpp2
-rw-r--r--include/mbgl/style/expression/curve.hpp2
-rw-r--r--include/mbgl/style/expression/expression.hpp2
-rw-r--r--include/mbgl/style/expression/let.hpp4
-rw-r--r--include/mbgl/style/expression/literal.hpp2
-rw-r--r--include/mbgl/style/expression/match.hpp2
-rw-r--r--include/mbgl/style/function/convert.hpp2
-rw-r--r--src/mbgl/style/expression/array_assertion.cpp2
-rw-r--r--src/mbgl/style/expression/assertion.cpp2
-rw-r--r--src/mbgl/style/expression/at.cpp2
-rw-r--r--src/mbgl/style/expression/boolean_operator.cpp4
-rw-r--r--src/mbgl/style/expression/case.cpp2
-rw-r--r--src/mbgl/style/expression/coalesce.cpp2
-rw-r--r--src/mbgl/style/expression/coercion.cpp2
-rw-r--r--src/mbgl/style/expression/let.cpp4
-rw-r--r--src/mbgl/style/expression/match.cpp2
23 files changed, 27 insertions, 27 deletions
diff --git a/include/mbgl/style/expression/array_assertion.hpp b/include/mbgl/style/expression/array_assertion.hpp
index 10e4bf58c8..aebd5375c9 100644
--- a/include/mbgl/style/expression/array_assertion.hpp
+++ b/include/mbgl/style/expression/array_assertion.hpp
@@ -21,7 +21,7 @@ public:
static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext ctx);
EvaluationResult evaluate(const EvaluationParameters& params) const override;
- void eachChild(std::function<void(const Expression*)> visit) const override;
+ void eachChild(const std::function<void(const Expression*)>& visit) const override;
private:
std::unique_ptr<Expression> input;
diff --git a/include/mbgl/style/expression/assertion.hpp b/include/mbgl/style/expression/assertion.hpp
index 68caa14998..c419f747a0 100644
--- a/include/mbgl/style/expression/assertion.hpp
+++ b/include/mbgl/style/expression/assertion.hpp
@@ -19,7 +19,7 @@ public:
static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext ctx);
EvaluationResult evaluate(const EvaluationParameters& params) const override;
- void eachChild(std::function<void(const Expression*)> visit) const override;
+ void eachChild(const std::function<void(const Expression*)>& visit) const override;
private:
std::vector<std::unique_ptr<Expression>> inputs;
diff --git a/include/mbgl/style/expression/at.hpp b/include/mbgl/style/expression/at.hpp
index 54f08d13a5..6b27a42d74 100644
--- a/include/mbgl/style/expression/at.hpp
+++ b/include/mbgl/style/expression/at.hpp
@@ -19,7 +19,7 @@ public:
static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext ctx);
EvaluationResult evaluate(const EvaluationParameters& params) const override;
- void eachChild(std::function<void(const Expression*)>) const override;
+ void eachChild(const std::function<void(const Expression*)>&) const override;
private:
std::unique_ptr<Expression> index;
diff --git a/include/mbgl/style/expression/boolean_operator.hpp b/include/mbgl/style/expression/boolean_operator.hpp
index 3a86aba0c1..2924379e98 100644
--- a/include/mbgl/style/expression/boolean_operator.hpp
+++ b/include/mbgl/style/expression/boolean_operator.hpp
@@ -18,7 +18,7 @@ public:
static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext ctx);
EvaluationResult evaluate(const EvaluationParameters& params) const override;
- void eachChild(std::function<void(const Expression*)> visit) const override;
+ void eachChild(const std::function<void(const Expression*)>& visit) const override;
private:
std::vector<std::unique_ptr<Expression>> inputs;
@@ -34,7 +34,7 @@ public:
static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext ctx);
EvaluationResult evaluate(const EvaluationParameters& params) const override;
- void eachChild(std::function<void(const Expression*)> visit) const override;
+ void eachChild(const std::function<void(const Expression*)>& visit) const override;
private:
std::vector<std::unique_ptr<Expression>> inputs;
diff --git a/include/mbgl/style/expression/case.hpp b/include/mbgl/style/expression/case.hpp
index 9304b81816..edc5b5969d 100644
--- a/include/mbgl/style/expression/case.hpp
+++ b/include/mbgl/style/expression/case.hpp
@@ -22,7 +22,7 @@ public:
static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext ctx);
EvaluationResult evaluate(const EvaluationParameters& params) const override;
- void eachChild(std::function<void(const Expression*)> visit) const override;
+ void eachChild(const std::function<void(const Expression*)>& visit) const override;
private:
std::vector<Branch> branches;
diff --git a/include/mbgl/style/expression/coalesce.hpp b/include/mbgl/style/expression/coalesce.hpp
index 2adec91240..110eec5f46 100644
--- a/include/mbgl/style/expression/coalesce.hpp
+++ b/include/mbgl/style/expression/coalesce.hpp
@@ -24,7 +24,7 @@ public:
EvaluationResult evaluate(const EvaluationParameters& params) const override;
- void eachChild(std::function<void(const Expression*)> visit) const override;
+ void eachChild(const std::function<void(const Expression*)>& visit) const override;
std::size_t getLength() const {
return args.size();
diff --git a/include/mbgl/style/expression/coercion.hpp b/include/mbgl/style/expression/coercion.hpp
index 79259f1b35..89576dff96 100644
--- a/include/mbgl/style/expression/coercion.hpp
+++ b/include/mbgl/style/expression/coercion.hpp
@@ -20,7 +20,7 @@ public:
static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext ctx);
EvaluationResult evaluate(const EvaluationParameters& params) const override;
- void eachChild(std::function<void(const Expression*)> visit) const override;
+ void eachChild(const std::function<void(const Expression*)>& visit) const override;
private:
EvaluationResult (*coerceSingleValue) (const Value& v);
diff --git a/include/mbgl/style/expression/compound_expression.hpp b/include/mbgl/style/expression/compound_expression.hpp
index c9ec5d6735..21c7c8020a 100644
--- a/include/mbgl/style/expression/compound_expression.hpp
+++ b/include/mbgl/style/expression/compound_expression.hpp
@@ -95,7 +95,7 @@ public:
return signature.apply(evaluationParams, args);
}
- void eachChild(std::function<void(const Expression*)> visit) const override {
+ void eachChild(const std::function<void(const Expression*)>& visit) const override {
for (const std::unique_ptr<Expression>& e : args) {
visit(e.get());
}
diff --git a/include/mbgl/style/expression/curve.hpp b/include/mbgl/style/expression/curve.hpp
index ba2347c0a3..3bbf7a2c4b 100644
--- a/include/mbgl/style/expression/curve.hpp
+++ b/include/mbgl/style/expression/curve.hpp
@@ -116,7 +116,7 @@ public:
}
- void eachChild(std::function<void(const Expression*)> visit) const override {
+ void eachChild(const std::function<void(const Expression*)>& visit) const override {
visit(input.get());
for (auto it = stops.begin(); it != stops.end(); it++) {
visit(it->second.get());
diff --git a/include/mbgl/style/expression/expression.hpp b/include/mbgl/style/expression/expression.hpp
index d481baa6a1..4474be280a 100644
--- a/include/mbgl/style/expression/expression.hpp
+++ b/include/mbgl/style/expression/expression.hpp
@@ -115,7 +115,7 @@ public:
virtual ~Expression() = default;
virtual EvaluationResult evaluate(const EvaluationParameters& params) const = 0;
- virtual void eachChild(std::function<void(const Expression*)>) const = 0;
+ virtual void eachChild(const std::function<void(const Expression*)>&) const = 0;
type::Type getType() const { return type; };
diff --git a/include/mbgl/style/expression/let.hpp b/include/mbgl/style/expression/let.hpp
index 5256ba5409..0432e919cd 100644
--- a/include/mbgl/style/expression/let.hpp
+++ b/include/mbgl/style/expression/let.hpp
@@ -24,7 +24,7 @@ public:
static ParseResult parse(const mbgl::style::conversion::Convertible&, ParsingContext);
EvaluationResult evaluate(const EvaluationParameters& params) const override;
- void eachChild(std::function<void(const Expression*)>) const override;
+ void eachChild(const std::function<void(const Expression*)>&) const override;
Expression* getResult() const {
return result.get();
@@ -46,7 +46,7 @@ public:
static ParseResult parse(const mbgl::style::conversion::Convertible&, ParsingContext);
EvaluationResult evaluate(const EvaluationParameters& params) const override;
- void eachChild(std::function<void(const Expression*)>) const override;
+ void eachChild(const std::function<void(const Expression*)>&) const override;
private:
std::string name;
diff --git a/include/mbgl/style/expression/literal.hpp b/include/mbgl/style/expression/literal.hpp
index 836b61097e..3447666703 100644
--- a/include/mbgl/style/expression/literal.hpp
+++ b/include/mbgl/style/expression/literal.hpp
@@ -20,7 +20,7 @@ public:
static ParseResult parse(const mbgl::style::conversion::Convertible&, ParsingContext);
- void eachChild(std::function<void(const Expression*)>) const override {}
+ void eachChild(const std::function<void(const Expression*)>&) const override {}
private:
Value value;
diff --git a/include/mbgl/style/expression/match.hpp b/include/mbgl/style/expression/match.hpp
index 5ec1e878b2..76fe5cdc86 100644
--- a/include/mbgl/style/expression/match.hpp
+++ b/include/mbgl/style/expression/match.hpp
@@ -25,7 +25,7 @@ public:
otherwise(std::move(otherwise_))
{}
- void eachChild(std::function<void(const Expression*)> visit) const override;
+ void eachChild(const std::function<void(const Expression*)>& visit) const override;
EvaluationResult evaluate(const EvaluationParameters& params) const override;
diff --git a/include/mbgl/style/function/convert.hpp b/include/mbgl/style/function/convert.hpp
index 5ae94e343e..07cf54ca6e 100644
--- a/include/mbgl/style/function/convert.hpp
+++ b/include/mbgl/style/function/convert.hpp
@@ -34,7 +34,7 @@ namespace detail {
class ErrorExpression : public Expression {
public:
ErrorExpression(std::string message_) : Expression(type::Error), message(std::move(message_)) {}
- void eachChild(std::function<void(const Expression*)>) const override {}
+ void eachChild(const std::function<void(const Expression*)>&) const override {}
EvaluationResult evaluate(const EvaluationParameters&) const override {
return EvaluationError{message};
diff --git a/src/mbgl/style/expression/array_assertion.cpp b/src/mbgl/style/expression/array_assertion.cpp
index 302d1b0178..1f47374d03 100644
--- a/src/mbgl/style/expression/array_assertion.cpp
+++ b/src/mbgl/style/expression/array_assertion.cpp
@@ -21,7 +21,7 @@ EvaluationResult ArrayAssertion::evaluate(const EvaluationParameters& params) co
return *result;
}
-void ArrayAssertion::eachChild(std::function<void(const Expression*)> visit) const {
+void ArrayAssertion::eachChild(const std::function<void(const Expression*)>& visit) const {
visit(input.get());
}
diff --git a/src/mbgl/style/expression/assertion.cpp b/src/mbgl/style/expression/assertion.cpp
index c92533ccd2..c16bab9bce 100644
--- a/src/mbgl/style/expression/assertion.cpp
+++ b/src/mbgl/style/expression/assertion.cpp
@@ -53,7 +53,7 @@ EvaluationResult Assertion::evaluate(const EvaluationParameters& params) const {
return EvaluationResult();
};
-void Assertion::eachChild(std::function<void(const Expression*)> visit) const {
+void Assertion::eachChild(const std::function<void(const Expression*)>& visit) const {
for(const std::unique_ptr<Expression>& input : inputs) {
visit(input.get());
}
diff --git a/src/mbgl/style/expression/at.cpp b/src/mbgl/style/expression/at.cpp
index eb354374d3..1b1893deaf 100644
--- a/src/mbgl/style/expression/at.cpp
+++ b/src/mbgl/style/expression/at.cpp
@@ -32,7 +32,7 @@ EvaluationResult At::evaluate(const EvaluationParameters& params) const {
return inputArray[static_cast<std::size_t>(i)];
}
-void At::eachChild(std::function<void(const Expression*)> visit) const {
+void At::eachChild(const std::function<void(const Expression*)>& visit) const {
visit(index.get());
visit(input.get());
}
diff --git a/src/mbgl/style/expression/boolean_operator.cpp b/src/mbgl/style/expression/boolean_operator.cpp
index d4d6aa1e7d..10c7ef4bde 100644
--- a/src/mbgl/style/expression/boolean_operator.cpp
+++ b/src/mbgl/style/expression/boolean_operator.cpp
@@ -13,7 +13,7 @@ EvaluationResult Any::evaluate(const EvaluationParameters& params) const {
return EvaluationResult(false);
}
-void Any::eachChild(std::function<void(const Expression*)> visit) const {
+void Any::eachChild(const std::function<void(const Expression*)>& visit) const {
for (const std::unique_ptr<Expression>& input : inputs) {
visit(input.get());
}
@@ -28,7 +28,7 @@ EvaluationResult All::evaluate(const EvaluationParameters& params) const {
return EvaluationResult(true);
}
-void All::eachChild(std::function<void(const Expression*)> visit) const {
+void All::eachChild(const std::function<void(const Expression*)>& visit) const {
for (const std::unique_ptr<Expression>& input : inputs) {
visit(input.get());
}
diff --git a/src/mbgl/style/expression/case.cpp b/src/mbgl/style/expression/case.cpp
index e6b402a9f6..c6d79186da 100644
--- a/src/mbgl/style/expression/case.cpp
+++ b/src/mbgl/style/expression/case.cpp
@@ -18,7 +18,7 @@ EvaluationResult Case::evaluate(const EvaluationParameters& params) const {
return otherwise->evaluate(params);
}
-void Case::eachChild(std::function<void(const Expression*)> visit) const {
+void Case::eachChild(const std::function<void(const Expression*)>& visit) const {
for (const Branch& branch : branches) {
visit(branch.first.get());
visit(branch.second.get());
diff --git a/src/mbgl/style/expression/coalesce.cpp b/src/mbgl/style/expression/coalesce.cpp
index 452fc9a2ce..a69723b497 100644
--- a/src/mbgl/style/expression/coalesce.cpp
+++ b/src/mbgl/style/expression/coalesce.cpp
@@ -13,7 +13,7 @@ EvaluationResult Coalesce::evaluate(const EvaluationParameters& params) const {
return result;
}
-void Coalesce::eachChild(std::function<void(const Expression*)> visit) const {
+void Coalesce::eachChild(const std::function<void(const Expression*)>& visit) const {
for (const std::unique_ptr<Expression>& arg : args) {
visit(arg.get());
}
diff --git a/src/mbgl/style/expression/coercion.cpp b/src/mbgl/style/expression/coercion.cpp
index 3e289b7c96..217a0757a9 100644
--- a/src/mbgl/style/expression/coercion.cpp
+++ b/src/mbgl/style/expression/coercion.cpp
@@ -122,7 +122,7 @@ EvaluationResult Coercion::evaluate(const EvaluationParameters& params) const {
return EvaluationResult();
};
-void Coercion::eachChild(std::function<void(const Expression*)> visit) const {
+void Coercion::eachChild(const std::function<void(const Expression*)>& visit) const {
for(const std::unique_ptr<Expression>& input : inputs) {
visit(input.get());
}
diff --git a/src/mbgl/style/expression/let.cpp b/src/mbgl/style/expression/let.cpp
index d5c4403052..0553df9624 100644
--- a/src/mbgl/style/expression/let.cpp
+++ b/src/mbgl/style/expression/let.cpp
@@ -9,7 +9,7 @@ EvaluationResult Let::evaluate(const EvaluationParameters& params) const {
return result->evaluate(params);
}
-void Let::eachChild(std::function<void(const Expression*)> visit) const {
+void Let::eachChild(const std::function<void(const Expression*)>& visit) const {
for (auto it = bindings.begin(); it != bindings.end(); it++) {
visit(it->second.get());
}
@@ -65,7 +65,7 @@ EvaluationResult Var::evaluate(const EvaluationParameters& params) const {
return value->evaluate(params);
}
-void Var::eachChild(std::function<void(const Expression*)>) const {}
+void Var::eachChild(const std::function<void(const Expression*)>&) const {}
ParseResult Var::parse(const Convertible& value_, ParsingContext ctx) {
assert(isArray(value_));
diff --git a/src/mbgl/style/expression/match.cpp b/src/mbgl/style/expression/match.cpp
index 414221b957..d132886dd4 100644
--- a/src/mbgl/style/expression/match.cpp
+++ b/src/mbgl/style/expression/match.cpp
@@ -6,7 +6,7 @@ namespace style {
namespace expression {
template <typename T>
-void Match<T>::eachChild(std::function<void(const Expression*)> visit) const {
+void Match<T>::eachChild(const std::function<void(const Expression*)>& visit) const {
visit(input.get());
for (const std::pair<T, std::shared_ptr<Expression>>& branch : branches) {
visit(branch.second.get());