From c53cbe52461e3c1f6f4e1bb6383a6a2e3e5a2cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Wed, 27 Feb 2019 16:41:48 +0100 Subject: [core] include what you use --- src/mbgl/gl/primitives.hpp | 2 ++ src/mbgl/gl/vertex_array_extension.hpp | 1 + src/mbgl/layout/pattern_layout.hpp | 2 +- src/mbgl/renderer/paint_parameters.hpp | 2 +- src/mbgl/renderer/paint_property_statistics.hpp | 2 ++ src/mbgl/tile/geometry_tile_worker.hpp | 3 --- src/mbgl/tile/tile_cache.cpp | 2 -- src/mbgl/tile/tile_cache.hpp | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/mbgl/gl/primitives.hpp b/src/mbgl/gl/primitives.hpp index fe6b1b2e5b..a101694643 100644 --- a/src/mbgl/gl/primitives.hpp +++ b/src/mbgl/gl/primitives.hpp @@ -1,5 +1,7 @@ #pragma once +#include + namespace mbgl { namespace gl { diff --git a/src/mbgl/gl/vertex_array_extension.hpp b/src/mbgl/gl/vertex_array_extension.hpp index 8c6abdc609..967d99af32 100644 --- a/src/mbgl/gl/vertex_array_extension.hpp +++ b/src/mbgl/gl/vertex_array_extension.hpp @@ -2,6 +2,7 @@ #include #include +#include namespace mbgl { namespace gl { diff --git a/src/mbgl/layout/pattern_layout.hpp b/src/mbgl/layout/pattern_layout.hpp index 744f6ab170..8dabfab919 100644 --- a/src/mbgl/layout/pattern_layout.hpp +++ b/src/mbgl/layout/pattern_layout.hpp @@ -46,7 +46,7 @@ public: for (const auto& layer : layers) { const typename B::PossiblyEvaluatedPaintProperties evaluatedProps = static_cast(layer)->evaluated; const auto patternProperty = evaluatedProps.template get(); - const auto constantPattern = patternProperty.constantOr(Faded >{ "", ""}); + const auto constantPattern = patternProperty.constantOr({ "", "" }); // determine if layer group has any layers that use *-pattern property and add // constant pattern dependencies. if (!patternProperty.isConstant()) { diff --git a/src/mbgl/renderer/paint_parameters.hpp b/src/mbgl/renderer/paint_parameters.hpp index d615c5e9b1..cd95003ac0 100644 --- a/src/mbgl/renderer/paint_parameters.hpp +++ b/src/mbgl/renderer/paint_parameters.hpp @@ -25,7 +25,7 @@ class UnwrappedTileID; namespace gl { class Context; -} +} // namespace gl class PaintParameters { public: diff --git a/src/mbgl/renderer/paint_property_statistics.hpp b/src/mbgl/renderer/paint_property_statistics.hpp index 59a8545911..017aa5ac3b 100644 --- a/src/mbgl/renderer/paint_property_statistics.hpp +++ b/src/mbgl/renderer/paint_property_statistics.hpp @@ -2,6 +2,8 @@ #include +#include + namespace mbgl { template diff --git a/src/mbgl/tile/geometry_tile_worker.hpp b/src/mbgl/tile/geometry_tile_worker.hpp index 89a3dbcc01..485d1315a6 100644 --- a/src/mbgl/tile/geometry_tile_worker.hpp +++ b/src/mbgl/tile/geometry_tile_worker.hpp @@ -10,9 +10,6 @@ #include #include #include -#include -#include -#include #include #include diff --git a/src/mbgl/tile/tile_cache.cpp b/src/mbgl/tile/tile_cache.cpp index 463d397608..d9363ead8f 100644 --- a/src/mbgl/tile/tile_cache.cpp +++ b/src/mbgl/tile/tile_cache.cpp @@ -1,6 +1,4 @@ #include -#include - #include namespace mbgl { diff --git a/src/mbgl/tile/tile_cache.hpp b/src/mbgl/tile/tile_cache.hpp index 88358b8cdc..1ef4b60934 100644 --- a/src/mbgl/tile/tile_cache.hpp +++ b/src/mbgl/tile/tile_cache.hpp @@ -1,6 +1,8 @@ #pragma once #include +#include + #include #include @@ -8,8 +10,6 @@ namespace mbgl { -class Tile; - class TileCache { public: TileCache(size_t size_ = 0) : size(size_) {} -- cgit v1.2.1