summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnand Thakker <github@anandthakker.net>2017-10-27 17:02:39 -0400
committerAnand Thakker <github@anandthakker.net>2017-10-30 14:54:25 -0400
commit4d3ee2f34a7b1b07b97f331e2ecdf3d611dbfbc5 (patch)
tree11a4ee34664ac4e9aac998aa48904325f171f465
parent74f7aa049570f96ceddddf01ab21b4e832221480 (diff)
downloadqtlocation-mapboxgl-4d3ee2f34a7b1b07b97f331e2ecdf3d611dbfbc5.tar.gz
Fix CI errors
-rw-r--r--cmake/render.cmake1
-rw-r--r--include/mbgl/style/expression/parsing_context.hpp8
2 files changed, 5 insertions, 4 deletions
diff --git a/cmake/render.cmake b/cmake/render.cmake
index f69aed16c0..aff9397f42 100644
--- a/cmake/render.cmake
+++ b/cmake/render.cmake
@@ -16,6 +16,7 @@ target_link_libraries(mbgl-render
target_add_mason_package(mbgl-render PRIVATE boost)
target_add_mason_package(mbgl-render PRIVATE boost_libprogram_options)
+target_add_mason_package(mbgl-render PRIVATE geojson)
mbgl_platform_render()
diff --git a/include/mbgl/style/expression/parsing_context.hpp b/include/mbgl/style/expression/parsing_context.hpp
index 9aa287869b..1ede3e50db 100644
--- a/include/mbgl/style/expression/parsing_context.hpp
+++ b/include/mbgl/style/expression/parsing_context.hpp
@@ -51,12 +51,15 @@ public:
class ParsingContext {
public:
ParsingContext() : errors(std::make_shared<std::vector<ParsingError>>()) {}
- ParsingContext(std::string key) : key(std::move(key)), errors(std::make_shared<std::vector<ParsingError>>()) {}
+ ParsingContext(std::string key_) : key(std::move(key_)), errors(std::make_shared<std::vector<ParsingError>>()) {}
explicit ParsingContext(optional<type::Type> expected_)
: expected(std::move(expected_)),
errors(std::make_shared<std::vector<ParsingError>>())
{}
ParsingContext(ParsingContext&&) = default;
+
+ ParsingContext(const ParsingContext&) = delete;
+ ParsingContext& operator=(const ParsingContext&) = delete;
std::string getKey() const { return key; }
optional<type::Type> getExpected() const { return expected; }
@@ -128,9 +131,6 @@ private:
errors(std::move(errors_))
{}
- ParsingContext(const ParsingContext&) = delete;
- ParsingContext& operator=(const ParsingContext&) = delete;
-
std::string key;
optional<type::Type> expected;
std::shared_ptr<detail::Scope> scope;