diff options
| author | Lucas Wojciechowski <lucas@mapbox.com> | 2018-04-18 15:22:01 -0700 |
|---|---|---|
| committer | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2018-05-09 16:08:50 -0700 |
| commit | 720df3d9d3b163d80842eab8ee0ecdc660340194 (patch) | |
| tree | c8e8ac488f6d196579e0441e2aed912626af9e67 | |
| parent | 3c683e9b0827573368d4c3d184dfa76eafefef27 (diff) | |
| download | qtlocation-mapboxgl-720df3d9d3b163d80842eab8ee0ecdc660340194.tar.gz | |
Try to fix `linux-gcc4.9-debug`
| -rw-r--r-- | platform/glfw/glfw_view.cpp | 4 | ||||
| -rw-r--r-- | platform/macos/macos.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp index 04839438c4..0c33d18c3e 100644 --- a/platform/glfw/glfw_view.cpp +++ b/platform/glfw/glfw_view.cpp @@ -640,8 +640,8 @@ void GLFWView::toggle3DExtrusions(bool visible) { std::vector<std::unique_ptr<mbgl::style::expression::Expression>> args; args.push_back(std::make_unique<mbgl::style::expression::Literal>(mbgl::style::expression::Value(std::string("extrude")))); args.push_back(std::make_unique<mbgl::style::expression::Literal>(mbgl::style::expression::Value(std::string("true")))); - mbgl::style::expression::ParsingContext context; - extrusionLayer->setFilter(mbgl::style::Filter { std::move(*mbgl::style::expression::createCompoundExpression("filter-==", std::move(args), context)) }); + mbgl::style::expression::ParsingContext parsingContext; + extrusionLayer->setFilter(mbgl::style::Filter { std::move(*mbgl::style::expression::createCompoundExpression("filter-==", std::move(args), parsingContext)) }); auto colorFn = mbgl::style::SourceFunction<mbgl::Color> { "height", mbgl::style::ExponentialStops<mbgl::Color> { diff --git a/platform/macos/macos.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/platform/macos/macos.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000000..18d981003d --- /dev/null +++ b/platform/macos/macos.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>IDEDidComputeMac32BitWarning</key> + <true/> +</dict> +</plist> |