From 3c175adf30546fe58713b8fed29ac35a85e150be Mon Sep 17 00:00:00 2001
From: Ivo van Dongen <info@ivovandongen.nl>
Date: Fri, 21 Apr 2017 09:19:47 -0700
Subject: [core] split off render layers

---
 include/mbgl/style/layers/background_layer.hpp     | 2 +-
 include/mbgl/style/layers/circle_layer.hpp         | 2 +-
 include/mbgl/style/layers/fill_extrusion_layer.hpp | 2 +-
 include/mbgl/style/layers/fill_layer.hpp           | 2 +-
 include/mbgl/style/layers/layer.hpp.ejs            | 2 +-
 include/mbgl/style/layers/line_layer.hpp           | 2 +-
 include/mbgl/style/layers/raster_layer.hpp         | 2 +-
 include/mbgl/style/layers/symbol_layer.hpp         | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'include/mbgl/style/layers')

diff --git a/include/mbgl/style/layers/background_layer.hpp b/include/mbgl/style/layers/background_layer.hpp
index 0de3302b7a..6604a868f3 100644
--- a/include/mbgl/style/layers/background_layer.hpp
+++ b/include/mbgl/style/layers/background_layer.hpp
@@ -50,7 +50,7 @@ public:
 
 template <>
 inline bool Layer::is<BackgroundLayer>() const {
-    return type == Type::Background;
+    return type == LayerType::Background;
 }
 
 } // namespace style
diff --git a/include/mbgl/style/layers/circle_layer.hpp b/include/mbgl/style/layers/circle_layer.hpp
index c12d476706..3a3723249f 100644
--- a/include/mbgl/style/layers/circle_layer.hpp
+++ b/include/mbgl/style/layers/circle_layer.hpp
@@ -100,7 +100,7 @@ public:
 
 template <>
 inline bool Layer::is<CircleLayer>() const {
-    return type == Type::Circle;
+    return type == LayerType::Circle;
 }
 
 } // namespace style
diff --git a/include/mbgl/style/layers/fill_extrusion_layer.hpp b/include/mbgl/style/layers/fill_extrusion_layer.hpp
index 31d517d016..1f79f87fac 100644
--- a/include/mbgl/style/layers/fill_extrusion_layer.hpp
+++ b/include/mbgl/style/layers/fill_extrusion_layer.hpp
@@ -82,7 +82,7 @@ public:
 
 template <>
 inline bool Layer::is<FillExtrusionLayer>() const {
-    return type == Type::FillExtrusion;
+    return type == LayerType::FillExtrusion;
 }
 
 } // namespace style
diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp
index aac4be92e2..8371ff7a8f 100644
--- a/include/mbgl/style/layers/fill_layer.hpp
+++ b/include/mbgl/style/layers/fill_layer.hpp
@@ -82,7 +82,7 @@ public:
 
 template <>
 inline bool Layer::is<FillLayer>() const {
-    return type == Type::Fill;
+    return type == LayerType::Fill;
 }
 
 } // namespace style
diff --git a/include/mbgl/style/layers/layer.hpp.ejs b/include/mbgl/style/layers/layer.hpp.ejs
index 972d932b59..59d7cd6415 100644
--- a/include/mbgl/style/layers/layer.hpp.ejs
+++ b/include/mbgl/style/layers/layer.hpp.ejs
@@ -75,7 +75,7 @@ public:
 
 template <>
 inline bool Layer::is<<%- camelize(type) %>Layer>() const {
-    return type == Type::<%- camelize(type) %>;
+    return type == LayerType::<%- camelize(type) %>;
 }
 
 } // namespace style
diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp
index 756cc6f431..a5f08e553c 100644
--- a/include/mbgl/style/layers/line_layer.hpp
+++ b/include/mbgl/style/layers/line_layer.hpp
@@ -120,7 +120,7 @@ public:
 
 template <>
 inline bool Layer::is<LineLayer>() const {
-    return type == Type::Line;
+    return type == LayerType::Line;
 }
 
 } // namespace style
diff --git a/include/mbgl/style/layers/raster_layer.hpp b/include/mbgl/style/layers/raster_layer.hpp
index 3596a71f58..c0351da5d0 100644
--- a/include/mbgl/style/layers/raster_layer.hpp
+++ b/include/mbgl/style/layers/raster_layer.hpp
@@ -77,7 +77,7 @@ public:
 
 template <>
 inline bool Layer::is<RasterLayer>() const {
-    return type == Type::Raster;
+    return type == LayerType::Raster;
 }
 
 } // namespace style
diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp
index 6e29faa949..ea6bda55d7 100644
--- a/include/mbgl/style/layers/symbol_layer.hpp
+++ b/include/mbgl/style/layers/symbol_layer.hpp
@@ -264,7 +264,7 @@ public:
 
 template <>
 inline bool Layer::is<SymbolLayer>() const {
-    return type == Type::Symbol;
+    return type == LayerType::Symbol;
 }
 
 } // namespace style
-- 
cgit v1.2.1