diff options
| author | danswick <dan.swick@gmail.com> | 2019-09-18 11:39:43 -0700 |
|---|---|---|
| committer | danswick <dan.swick@gmail.com> | 2019-09-18 11:39:43 -0700 |
| commit | 46914ecff8b3f2a1945b33358a879c2aac074f17 (patch) | |
| tree | 697cf276a43ae4c18c0ad7029c00e7d771448822 /src/mbgl/style/layer.cpp | |
| parent | 47ea84ad1a5fed3431d026c5765c17c507d4623e (diff) | |
| parent | 8805defe57aa0d8886c7828d39b1b9b1f17f21b8 (diff) | |
| download | qtlocation-mapboxgl-upstream/android-docs-automation.tar.gz | |
Merge branch 'master' into android-docs-automationupstream/android-docs-automation
Diffstat (limited to 'src/mbgl/style/layer.cpp')
| -rw-r--r-- | src/mbgl/style/layer.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/mbgl/style/layer.cpp b/src/mbgl/style/layer.cpp index 328cd47555..04a897022c 100644 --- a/src/mbgl/style/layer.cpp +++ b/src/mbgl/style/layer.cpp @@ -1,15 +1,23 @@ -#include <mbgl/style/layer.hpp> -#include <mbgl/style/layer_impl.hpp> -#include <mbgl/style/layer_observer.hpp> #include <mbgl/style/conversion/constant.hpp> #include <mbgl/style/conversion/filter.hpp> #include <mbgl/style/conversion_impl.hpp> +#include <mbgl/style/layer.hpp> +#include <mbgl/style/layer_impl.hpp> +#include <mbgl/style/layer_observer.hpp> +#include <mbgl/tile/tile.hpp> #include <mbgl/renderer/render_layer.hpp> namespace mbgl { namespace style { +static_assert(mbgl::underlying_type(Tile::Kind::Geometry) == mbgl::underlying_type(LayerTypeInfo::TileKind::Geometry), + "tile kind error"); +static_assert(mbgl::underlying_type(Tile::Kind::Raster) == mbgl::underlying_type(LayerTypeInfo::TileKind::Raster), + "tile kind error"); +static_assert(mbgl::underlying_type(Tile::Kind::RasterDEM) == mbgl::underlying_type(LayerTypeInfo::TileKind::RasterDEM), + "tile kind error"); + static LayerObserver nullObserver; Layer::Layer(Immutable<Impl> impl) |