diff options
| author | Artem Pavlenko <artem@mapnik.org> | 2020-02-14 16:56:46 +0000 |
|---|---|---|
| committer | Artem Pavlenko <artem@mapnik.org> | 2020-02-14 16:56:46 +0000 |
| commit | 145c053a02d918d74002ea690dac398ee588a374 (patch) | |
| tree | c645ffaec12822f0668858181248cd7365fc4e20 /src/mbgl/renderer/layers/render_circle_layer.cpp | |
| parent | 37a4660ca367f141b9e0dedf3932c74f0ee0c920 (diff) | |
| parent | 59294aaef333bdd455bd13d6bab6fca730379b52 (diff) | |
| download | qtlocation-mapboxgl-145c053a02d918d74002ea690dac398ee588a374.tar.gz | |
Merge branch 'master' into galinelle_setStyle++_updatedupstream/galinelle_setStyle++_updated
Diffstat (limited to 'src/mbgl/renderer/layers/render_circle_layer.cpp')
| -rw-r--r-- | src/mbgl/renderer/layers/render_circle_layer.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mbgl/renderer/layers/render_circle_layer.cpp b/src/mbgl/renderer/layers/render_circle_layer.cpp index b88a026e11..e5d7e6230e 100644 --- a/src/mbgl/renderer/layers/render_circle_layer.cpp +++ b/src/mbgl/renderer/layers/render_circle_layer.cpp @@ -17,7 +17,7 @@ using namespace style; namespace { -inline const style::CircleLayer::Impl& impl(const Immutable<style::Layer::Impl>& impl) { +inline const style::CircleLayer::Impl& impl_cast(const Immutable<style::Layer::Impl>& impl) { assert(impl->getTypeInfo() == CircleLayer::Impl::staticTypeInfo()); return static_cast<const style::CircleLayer::Impl&>(*impl); } @@ -26,11 +26,10 @@ inline const style::CircleLayer::Impl& impl(const Immutable<style::Layer::Impl>& RenderCircleLayer::RenderCircleLayer(Immutable<style::CircleLayer::Impl> _impl) : RenderLayer(makeMutable<CircleLayerProperties>(std::move(_impl))), - unevaluated(impl(baseImpl).paint.untransitioned()) { -} + unevaluated(impl_cast(baseImpl).paint.untransitioned()) {} void RenderCircleLayer::transition(const TransitionParameters& parameters) { - unevaluated = impl(baseImpl).paint.transitioned(parameters, std::move(unevaluated)); + unevaluated = impl_cast(baseImpl).paint.transitioned(parameters, std::move(unevaluated)); } void RenderCircleLayer::evaluate(const PropertyEvaluationParameters& parameters) { |