[core] Remove casts where expected type is part of the contract

2 files changed, 7 insertions, 7 deletions

diff --git a/src/mbgl/layout/pattern_layout.hpp b/src/mbgl/layout/pattern_layout.hpp
index 0ffac36b75..a29221c547 100644
--- a/src/mbgl/layout/pattern_layout.hpp
+++ b/src/mbgl/layout/pattern_layout.hpp
@@ -37,14 +37,14 @@ public:
                     hasPattern(false) {
 
         using PatternLayer = typename B::RenderLayerType;
-        const auto renderLayer = layers.at(0)->as<PatternLayer>();
+        const auto renderLayer = static_cast<const PatternLayer*>(layers.at(0));
         const typename PatternLayer::StyleLayerImpl& leader = renderLayer->impl();
         layout = leader.layout.evaluate(PropertyEvaluationParameters(zoom));
         sourceLayerID = leader.sourceLayer;
         groupID = renderLayer->getID();
 
         for (const auto& layer : layers) {
-            const typename B::PossiblyEvaluatedPaintProperties evaluatedProps = layer->as<PatternLayer>()->paintProperties();
+            const typename B::PossiblyEvaluatedPaintProperties evaluatedProps = static_cast<const PatternLayer*>(layer)->paintProperties();
             layerPaintProperties.emplace(layer->getID(), std::move(evaluatedProps));
             const auto patternProperty = evaluatedProps.template get<typename PatternLayer::PatternProperty>();
             const auto constantPattern = patternProperty.constantOr(Faded<std::basic_string<char> >{ "", ""});
diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp
index 6d20afeb8d..332fb3f46a 100644
--- a/src/mbgl/layout/symbol_layout.cpp
+++ b/src/mbgl/layout/symbol_layout.cpp
@@ -50,11 +50,11 @@ SymbolLayout::SymbolLayout(const BucketParameters& parameters,
       pixelRatio(parameters.pixelRatio),
       tileSize(util::tileSize * overscaling),
       tilePixelRatio(float(util::EXTENT) / tileSize),
-      textSize(layers.at(0)->as<RenderSymbolLayer>()->impl().layout.get<TextSize>()),
-      iconSize(layers.at(0)->as<RenderSymbolLayer>()->impl().layout.get<IconSize>())
+      textSize(toRenderSymbolLayer(layers.at(0))->impl().layout.get<TextSize>()),
+      iconSize(toRenderSymbolLayer(layers.at(0))->impl().layout.get<IconSize>())
     {
 
-    const SymbolLayer::Impl& leader = layers.at(0)->as<RenderSymbolLayer>()->impl();
+    const SymbolLayer::Impl& leader = toRenderSymbolLayer(layers.at(0))->impl();
 
     layout = leader.layout.evaluate(PropertyEvaluationParameters(zoom));
 
@@ -91,8 +91,8 @@ SymbolLayout::SymbolLayout(const BucketParameters& parameters,
 
     for (const auto& layer : layers) {
         layerPaintProperties.emplace(layer->getID(), std::make_pair(
-            layer->as<RenderSymbolLayer>()->iconPaintProperties(),
-            layer->as<RenderSymbolLayer>()->textPaintProperties()
+            toRenderSymbolLayer(layer)->iconPaintProperties(),
+            toRenderSymbolLayer(layer)->textPaintProperties()
         ));
     }