diff options
author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-11-10 20:04:20 -0200 |
---|---|---|
committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-11-12 13:17:57 -0200 |
commit | 92608f58858d77c17a65ae9b29758e74bb2da7d2 (patch) | |
tree | f4b0287febdea20ae58d4dc31be294d50253b254 /src/mbgl/style/expression/parsing_context.cpp | |
parent | 465b345dd2d9e8ff95accecc84b6ec6ff24e0a2f (diff) | |
download | qtlocation-mapboxgl-92608f58858d77c17a65ae9b29758e74bb2da7d2.tar.gz |
[core] Fix build on Android + GCC and Android + armeabi
Sadly we don't have bots for these two setups.
Diffstat (limited to 'src/mbgl/style/expression/parsing_context.cpp')
-rw-r--r-- | src/mbgl/style/expression/parsing_context.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mbgl/style/expression/parsing_context.cpp b/src/mbgl/style/expression/parsing_context.cpp index 81cbdede59..501ba2749f 100644 --- a/src/mbgl/style/expression/parsing_context.cpp +++ b/src/mbgl/style/expression/parsing_context.cpp @@ -23,6 +23,8 @@ #include <mbgl/style/conversion/get_json_type.hpp> +#include <mbgl/util/string.hpp> + namespace mbgl { namespace style { namespace expression { @@ -55,7 +57,7 @@ bool isConstant(const Expression& expression) { using namespace mbgl::style::conversion; ParseResult ParsingContext::parse(const Convertible& value, std::size_t index_, optional<type::Type> expected_) { - ParsingContext child(key + "[" + std::to_string(index_) + "]", + ParsingContext child(key + "[" + util::toString(index_) + "]", errors, std::move(expected_), scope); @@ -64,7 +66,7 @@ ParseResult ParsingContext::parse(const Convertible& value, std::size_t index_, ParseResult ParsingContext::parse(const Convertible& value, std::size_t index_, optional<type::Type> expected_, const std::map<std::string, std::shared_ptr<Expression>>& bindings) { - ParsingContext child(key + "[" + std::to_string(index_) + "]", + ParsingContext child(key + "[" + util::toString(index_) + "]", errors, std::move(expected_), std::make_shared<detail::Scope>(bindings, scope)); |