diff options
author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-03-20 12:38:09 +0200 |
---|---|---|
committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-03-23 20:05:40 +0200 |
commit | 9dbd0a666a25b3950d461d41f6c41fc8acea8d81 (patch) | |
tree | 757196c0d7efc9c6f198098be5d227d754b0b378 /src/mbgl/style | |
parent | 76b99eb8e8f0138a1020b01e45bf8fd859051b1c (diff) | |
download | qtlocation-mapboxgl-9dbd0a666a25b3950d461d41f6c41fc8acea8d81.tar.gz |
[core] Fix modernize-pass-by-value errors
As reported by clang-tidy-8.
Diffstat (limited to 'src/mbgl/style')
-rw-r--r-- | src/mbgl/style/conversion/get_json_type.cpp | 8 | ||||
-rw-r--r-- | src/mbgl/style/expression/compound_expression.cpp | 15 |
2 files changed, 8 insertions, 15 deletions
diff --git a/src/mbgl/style/conversion/get_json_type.cpp b/src/mbgl/style/conversion/get_json_type.cpp index 2e9d35a957..06becbb121 100644 --- a/src/mbgl/style/conversion/get_json_type.cpp +++ b/src/mbgl/style/conversion/get_json_type.cpp @@ -23,11 +23,9 @@ std::string getJSONType(const Convertible& value) { // conversion succeeds. assert(v); - return v->match( - [&] (const std::string&) { return "string"; }, - [&] (bool) { return "boolean"; }, - [&] (auto) { return "number"; } - ); + return v->match([&](const std::string&) { return "string"; }, + [&](bool) { return "boolean"; }, + [&](const auto&) { return "number"; }); } } // namespace conversion diff --git a/src/mbgl/style/expression/compound_expression.cpp b/src/mbgl/style/expression/compound_expression.cpp index 45b8b793a2..31628617f6 100644 --- a/src/mbgl/style/expression/compound_expression.cpp +++ b/src/mbgl/style/expression/compound_expression.cpp @@ -249,17 +249,15 @@ optional<double> featurePropertyAsDouble(const EvaluationContext& params, const return property->match([](double value) { return value; }, [](uint64_t value) -> optional<double> { return {static_cast<double>(value)}; }, [](int64_t value) -> optional<double> { return {static_cast<double>(value)}; }, - [](auto) -> optional<double> { return {}; }); + [](const auto&) -> optional<double> { return {}; }); }; optional<std::string> featurePropertyAsString(const EvaluationContext& params, const std::string& key) { assert(params.feature); auto property = params.feature->getValue(key); if (!property) return {}; - return property->match( - [](std::string value) { return value; }, - [](auto) { return optional<std::string>(); } - ); + return property->match([](std::string value) { return value; }, + [](const auto&) { return optional<std::string>(); }); }; optional<double> featureIdAsDouble(const EvaluationContext& params) { @@ -268,16 +266,13 @@ optional<double> featureIdAsDouble(const EvaluationContext& params) { return id.match([](double value) { return value; }, [](uint64_t value) -> optional<double> { return {static_cast<double>(value)}; }, [](int64_t value) -> optional<double> { return {static_cast<double>(value)}; }, - [](auto) -> optional<double> { return {}; }); + [](const auto&) -> optional<double> { return {}; }); }; optional<std::string> featureIdAsString(const EvaluationContext& params) { assert(params.feature); auto id = params.feature->getID(); - return id.match( - [](std::string value) { return value; }, - [](auto) { return optional<std::string>(); } - ); + return id.match([](std::string value) { return value; }, [](const auto&) { return optional<std::string>(); }); }; const auto& eCompoundExpression() { |