diff options
| author | Anand Thakker <github@anandthakker.net> | 2017-08-19 12:16:43 -0400 |
|---|---|---|
| committer | Anand Thakker <github@anandthakker.net> | 2017-10-13 12:50:51 -0400 |
| commit | 234b7497bb04c13a7f72b6b7b1c05577463dacf8 (patch) | |
| tree | d3bea6003f58acffce97295fbe5090724231406f | |
| parent | 06f3c26c0d30b76ba588d66eee89b2ea331b7023 (diff) | |
| download | qtlocation-mapboxgl-234b7497bb04c13a7f72b6b7b1c05577463dacf8.tar.gz | |
Fixup CI errors
| -rw-r--r-- | include/mbgl/style/expression/check_subtype.hpp | 2 | ||||
| -rw-r--r-- | include/mbgl/style/expression/compound_expression.hpp | 4 | ||||
| -rw-r--r-- | include/mbgl/style/expression/parse/let.hpp | 4 | ||||
| -rw-r--r-- | include/mbgl/style/expression/parsing_context.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/style/expression/check_subtype.cpp | 1 |
5 files changed, 8 insertions, 5 deletions
diff --git a/include/mbgl/style/expression/check_subtype.hpp b/include/mbgl/style/expression/check_subtype.hpp index 02ebe3ed1c..6f5126cd8d 100644 --- a/include/mbgl/style/expression/check_subtype.hpp +++ b/include/mbgl/style/expression/check_subtype.hpp @@ -1,7 +1,9 @@ #pragma once +#include <memory> #include <mbgl/style/expression/parsing_context.hpp> #include <mbgl/style/expression/type.hpp> +#include <mbgl/util/optional.hpp> namespace mbgl { namespace style { diff --git a/include/mbgl/style/expression/compound_expression.hpp b/include/mbgl/style/expression/compound_expression.hpp index 9774390bf6..09de30b1ee 100644 --- a/include/mbgl/style/expression/compound_expression.hpp +++ b/include/mbgl/style/expression/compound_expression.hpp @@ -69,8 +69,8 @@ public: args(std::move(args_)) {} - EvaluationResult evaluate(const EvaluationParameters& params) const override { - return signature.apply(params, args); + EvaluationResult evaluate(const EvaluationParameters& evaluationParams) const override { + return signature.apply(evaluationParams, args); } void accept(std::function<void(const Expression*)> visitor) const override { diff --git a/include/mbgl/style/expression/parse/let.hpp b/include/mbgl/style/expression/parse/let.hpp index b3866b6cd8..20613d060d 100644 --- a/include/mbgl/style/expression/parse/let.hpp +++ b/include/mbgl/style/expression/parse/let.hpp @@ -65,8 +65,8 @@ struct ParseVar { optional<std::shared_ptr<Expression>> bindingValue = ctx.getBinding(name); if (!bindingValue) { - ctx.error("Unknown variable \"" + name + "\". Make sure \"" + - name + "\" has been bound in an enclosing \"let\" expression before using it.", 1); + ctx.error(R"(Unknown variable ")" + name + R"(". Make sure ")" + + name + R"(" has been bound in an enclosing "let" expression before using it.)", 1); return ParseResult(); } diff --git a/include/mbgl/style/expression/parsing_context.hpp b/include/mbgl/style/expression/parsing_context.hpp index fff4f3c0f0..78d126786c 100644 --- a/include/mbgl/style/expression/parsing_context.hpp +++ b/include/mbgl/style/expression/parsing_context.hpp @@ -22,7 +22,7 @@ namespace detail { struct Scope { Scope(const std::map<std::string, std::shared_ptr<Expression>>& bindings_, std::shared_ptr<Scope> parent_ = nullptr) : bindings(bindings_), - parent(parent_) + parent(std::move(parent_)) {} const std::map<std::string, std::shared_ptr<Expression>>& bindings; diff --git a/src/mbgl/style/expression/check_subtype.cpp b/src/mbgl/style/expression/check_subtype.cpp index bcdc5128b9..d2d22fc52b 100644 --- a/src/mbgl/style/expression/check_subtype.cpp +++ b/src/mbgl/style/expression/check_subtype.cpp @@ -1,3 +1,4 @@ +#include <string> #include <mbgl/style/expression/check_subtype.hpp> namespace mbgl { |