diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-03-13 18:35:29 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-03-13 20:42:30 +0100 |
commit | 979433eddb5a8f2180aba134befb08b222718bc8 (patch) | |
tree | a307962a9105152514b6ab37f98818b6d4431204 /src/mbgl | |
parent | e9805b60ee77fcb91dcaac89c09290d185d072bd (diff) | |
download | qtlocation-mapboxgl-979433eddb5a8f2180aba134befb08b222718bc8.tar.gz |
[build] update Boost to 1.69 and remove RTTI
Diffstat (limited to 'src/mbgl')
-rw-r--r-- | src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp | 1 | ||||
-rw-r--r-- | src/mbgl/renderer/layers/render_fill_layer.cpp | 1 | ||||
-rw-r--r-- | src/mbgl/renderer/layers/render_line_layer.cpp | 1 | ||||
-rw-r--r-- | src/mbgl/sprite/sprite_loader.cpp | 4 |
4 files changed, 2 insertions, 5 deletions
diff --git a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp index 99bdc3a8c6..08f35f1c76 100644 --- a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp @@ -136,7 +136,6 @@ void RenderFillExtrusionLayer::render(PaintParameters& parameters, RenderSource* continue; } const auto fillPatternValue = evaluated.get<FillExtrusionPattern>().constantOr(mbgl::Faded<std::basic_string<char> >{"", ""}); - assert(dynamic_cast<GeometryTile*>(&tile.tile)); GeometryTile& geometryTile = static_cast<GeometryTile&>(tile.tile); optional<ImagePosition> patternPosA = geometryTile.getPattern(fillPatternValue.from); optional<ImagePosition> patternPosB = geometryTile.getPattern(fillPatternValue.to); diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp index 3e36561ffb..83989fa012 100644 --- a/src/mbgl/renderer/layers/render_fill_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_layer.cpp @@ -147,7 +147,6 @@ void RenderFillLayer::render(PaintParameters& parameters, RenderSource*) { } const auto fillPatternValue = evaluated.get<FillPattern>().constantOr(Faded<std::basic_string<char>>{"", ""}); for (const RenderTile& tile : renderTiles) { - assert(dynamic_cast<GeometryTile*>(&tile.tile)); GeometryTile& geometryTile = static_cast<GeometryTile&>(tile.tile); optional<ImagePosition> patternPosA = geometryTile.getPattern(fillPatternValue.from); optional<ImagePosition> patternPosB = geometryTile.getPattern(fillPatternValue.to); diff --git a/src/mbgl/renderer/layers/render_line_layer.cpp b/src/mbgl/renderer/layers/render_line_layer.cpp index f3947685fe..096afadf7d 100644 --- a/src/mbgl/renderer/layers/render_line_layer.cpp +++ b/src/mbgl/renderer/layers/render_line_layer.cpp @@ -128,7 +128,6 @@ void RenderLineLayer::render(PaintParameters& parameters, RenderSource*) { } else if (!unevaluated.get<LinePattern>().isUndefined()) { const auto linePatternValue = evaluated.get<LinePattern>().constantOr(Faded<std::basic_string<char>>{ "", ""}); - assert(dynamic_cast<GeometryTile*>(&tile.tile)); GeometryTile& geometryTile = static_cast<GeometryTile&>(tile.tile); const Size texsize = geometryTile.iconAtlasTexture->size; diff --git a/src/mbgl/sprite/sprite_loader.cpp b/src/mbgl/sprite/sprite_loader.cpp index df4fe6e8df..ce8fbe5894 100644 --- a/src/mbgl/sprite/sprite_loader.cpp +++ b/src/mbgl/sprite/sprite_loader.cpp @@ -55,7 +55,7 @@ void SpriteLoader::load(const std::string& url, Scheduler& scheduler, FileSource } else if (res.notModified) { return; } else if (res.noContent) { - loader->json = std::make_shared<const std::string>(); + loader->json = std::make_shared<std::string>(); emitSpriteLoadedIfComplete(); } else { // Only trigger a sprite loaded event we got new data. @@ -70,7 +70,7 @@ void SpriteLoader::load(const std::string& url, Scheduler& scheduler, FileSource } else if (res.notModified) { return; } else if (res.noContent) { - loader->image = std::make_shared<const std::string>(); + loader->image = std::make_shared<std::string>(); emitSpriteLoadedIfComplete(); } else { loader->image = res.data; |