From d15b9c1f9c1afa29175ba2e398adc680e66147e6 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Fri, 20 Mar 2020 12:38:09 +0200 Subject: [core] Fix performance-unnecessary-value-param errors As reported by clang-tidy-8. --- include/mbgl/style/expression/collator.hpp | 2 +- include/mbgl/style/expression/comparison.hpp | 4 ++-- include/mbgl/style/expression/compound_expression.hpp | 2 +- include/mbgl/style/expression/dsl.hpp | 8 ++++---- include/mbgl/style/expression/parsing_context.hpp | 11 +++++------ 5 files changed, 13 insertions(+), 14 deletions(-) (limited to 'include/mbgl/style/expression') diff --git a/include/mbgl/style/expression/collator.hpp b/include/mbgl/style/expression/collator.hpp index 51ba426fad..95a072618a 100644 --- a/include/mbgl/style/expression/collator.hpp +++ b/include/mbgl/style/expression/collator.hpp @@ -11,7 +11,7 @@ namespace expression { class Collator { public: - Collator(bool caseSensitive, bool diacriticSensitive, optional locale = {}); + Collator(bool caseSensitive, bool diacriticSensitive, const optional& locale = {}); bool operator==(const Collator& other) const; diff --git a/include/mbgl/style/expression/comparison.hpp b/include/mbgl/style/expression/comparison.hpp index cf64f5cd34..df1fbcab9e 100644 --- a/include/mbgl/style/expression/comparison.hpp +++ b/include/mbgl/style/expression/comparison.hpp @@ -15,7 +15,7 @@ ParseResult parseComparison(const mbgl::style::conversion::Convertible&, Parsing class BasicComparison : public Expression { public: - using CompareFunctionType = bool (*) (Value, Value); + using CompareFunctionType = bool (*)(const Value&, const Value&); BasicComparison( std::string op, @@ -38,7 +38,7 @@ private: class CollatorComparison : public Expression { public: - using CompareFunctionType = bool (*) (std::string, std::string, Collator); + using CompareFunctionType = bool (*)(const std::string&, const std::string&, const Collator&); CollatorComparison( std::string op, diff --git a/include/mbgl/style/expression/compound_expression.hpp b/include/mbgl/style/expression/compound_expression.hpp index 57a96d08a0..c6c66c3fc6 100644 --- a/include/mbgl/style/expression/compound_expression.hpp +++ b/include/mbgl/style/expression/compound_expression.hpp @@ -46,7 +46,7 @@ protected: std::vector> args; }; -ParseResult parseCompoundExpression(const std::string name, +ParseResult parseCompoundExpression(const std::string& name, const mbgl::style::conversion::Convertible& value, ParsingContext& ctx); diff --git a/include/mbgl/style/expression/dsl.hpp b/include/mbgl/style/expression/dsl.hpp index 347861abc9..6bb1d22d64 100644 --- a/include/mbgl/style/expression/dsl.hpp +++ b/include/mbgl/style/expression/dsl.hpp @@ -29,13 +29,13 @@ std::unique_ptr createExpression(const mbgl::style::conversion::Conv std::unique_ptr error(std::string); std::unique_ptr literal(const char* value); -std::unique_ptr literal(Value value); +std::unique_ptr literal(const Value& value); std::unique_ptr literal(std::initializer_list value); std::unique_ptr literal(std::initializer_list value); -std::unique_ptr -assertion(type::Type, std::unique_ptr, - std::unique_ptr def = nullptr); +std::unique_ptr assertion(const type::Type&, + std::unique_ptr, + std::unique_ptr def = nullptr); std::unique_ptr number(std::unique_ptr, std::unique_ptr def = nullptr); std::unique_ptr string(std::unique_ptr, diff --git a/include/mbgl/style/expression/parsing_context.hpp b/include/mbgl/style/expression/parsing_context.hpp index 596b136419..40da7c26d0 100644 --- a/include/mbgl/style/expression/parsing_context.hpp +++ b/include/mbgl/style/expression/parsing_context.hpp @@ -93,7 +93,7 @@ public: Parse the given style-spec JSON value as an expression. */ ParseResult parseExpression(const mbgl::style::conversion::Convertible& value, - optional = {}); + const optional& = {}); /* Parse the given style-spec JSON value as an expression intended to be used @@ -108,8 +108,8 @@ public: ParseResult parse(const mbgl::style::conversion::Convertible&, std::size_t, optional = {}, - optional = {}); - + const optional& = {}); + /* Parse a child expression. For use by individual Expression::parse() methods. */ @@ -168,9 +168,8 @@ private: type (either Literal, or the one named in value[0]) and dispatching to the appropriate ParseXxxx::parse(const V&, ParsingContext) method. */ - ParseResult parse(const mbgl::style::conversion::Convertible& value, - optional = {}); - + ParseResult parse(const mbgl::style::conversion::Convertible& value, const optional& = {}); + std::string key; optional expected; std::shared_ptr scope; -- cgit v1.2.1