diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-02-27 16:41:48 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-03-01 09:33:37 +0100 |
commit | c53cbe52461e3c1f6f4e1bb6383a6a2e3e5a2cae (patch) | |
tree | d4a2e81a7012ee1843900a52e8ddea1117dbaf23 /src | |
parent | 95deab32ceadd2bca3912d866e76c6b0f1b931f4 (diff) | |
download | qtlocation-mapboxgl-c53cbe52461e3c1f6f4e1bb6383a6a2e3e5a2cae.tar.gz |
[core] include what you use
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/gl/primitives.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/gl/vertex_array_extension.hpp | 1 | ||||
-rw-r--r-- | src/mbgl/layout/pattern_layout.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/paint_parameters.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/paint_property_statistics.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/tile/geometry_tile_worker.hpp | 3 | ||||
-rw-r--r-- | src/mbgl/tile/tile_cache.cpp | 2 | ||||
-rw-r--r-- | 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 <cstddef> + 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 <mbgl/gl/extension.hpp> #include <mbgl/gl/defines.hpp> +#include <mbgl/platform/gl_functions.hpp> 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<const PatternLayer*>(layer)->evaluated; const auto patternProperty = evaluatedProps.template get<typename PatternLayer::PatternProperty>(); - const auto constantPattern = patternProperty.constantOr(Faded<std::basic_string<char> >{ "", ""}); + 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 <mbgl/util/optional.hpp> +#include <algorithm> + namespace mbgl { template <class T> 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 <mbgl/style/layer_impl.hpp> #include <mbgl/geometry/feature_index.hpp> #include <mbgl/renderer/bucket.hpp> -#include <mbgl/renderer/buckets/fill_bucket.hpp> -#include <mbgl/renderer/buckets/fill_extrusion_bucket.hpp> -#include <mbgl/renderer/buckets/line_bucket.hpp> #include <atomic> #include <memory> 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 <mbgl/tile/tile_cache.hpp> -#include <mbgl/tile/tile.hpp> - #include <cassert> 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 <mbgl/tile/tile_id.hpp> +#include <mbgl/tile/tile.hpp> + #include <list> #include <memory> @@ -8,8 +10,6 @@ namespace mbgl { -class Tile; - class TileCache { public: TileCache(size_t size_ = 0) : size(size_) {} |