diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-03-10 16:07:33 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-03-10 16:07:33 -0700 |
commit | 7212accffd8ebecdcb862826480bfb828cef3ff5 (patch) | |
tree | 28b2c1d3ab1398e447e96c1f73200d6d6de30a1d /src | |
parent | 3e068be4ad6076ba2721a1140012a2ca2c005139 (diff) | |
download | qtlocation-mapboxgl-7212accffd8ebecdcb862826480bfb828cef3ff5.tar.gz |
More include fixes
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/map/geometry_tile.cpp | 1 | ||||
-rw-r--r-- | src/mbgl/map/geometry_tile.hpp | 5 | ||||
-rw-r--r-- | src/mbgl/map/vector_tile.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/filter_expression.cpp | 1 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/mbgl/map/geometry_tile.cpp b/src/mbgl/map/geometry_tile.cpp index f87468914c..785845b4db 100644 --- a/src/mbgl/map/geometry_tile.cpp +++ b/src/mbgl/map/geometry_tile.cpp @@ -1,4 +1,5 @@ #include <mbgl/map/geometry_tile.hpp> +#include <mbgl/style/filter_expression.hpp> #include <mbgl/style/filter_expression_private.hpp> namespace mbgl { diff --git a/src/mbgl/map/geometry_tile.hpp b/src/mbgl/map/geometry_tile.hpp index f303a32bde..3df0661fbf 100644 --- a/src/mbgl/map/geometry_tile.hpp +++ b/src/mbgl/map/geometry_tile.hpp @@ -1,9 +1,7 @@ #ifndef MBGL_MAP_GEOMETRY_TILE #define MBGL_MAP_GEOMETRY_TILE -#include <mbgl/style/filter_expression.hpp> #include <mbgl/style/value.hpp> -#include <mbgl/text/glyph.hpp> #include <mbgl/util/optional.hpp> #include <mbgl/util/ptr.hpp> #include <mbgl/util/variant.hpp> @@ -11,10 +9,7 @@ #include <mbgl/util/noncopyable.hpp> #include <cstdint> -#include <map> #include <string> -#include <type_traits> -#include <unordered_map> #include <vector> namespace mbgl { diff --git a/src/mbgl/map/vector_tile.hpp b/src/mbgl/map/vector_tile.hpp index fc8c5966a0..ae08b54e2e 100644 --- a/src/mbgl/map/vector_tile.hpp +++ b/src/mbgl/map/vector_tile.hpp @@ -4,6 +4,8 @@ #include <mbgl/map/geometry_tile.hpp> #include <mbgl/util/pbf.hpp> +#include <map> + namespace mbgl { class VectorTileLayer; diff --git a/src/mbgl/style/filter_expression.cpp b/src/mbgl/style/filter_expression.cpp index ec44b57b55..684715b026 100644 --- a/src/mbgl/style/filter_expression.cpp +++ b/src/mbgl/style/filter_expression.cpp @@ -1,3 +1,4 @@ +#include <mbgl/style/filter_expression.hpp> #include <mbgl/map/geometry_tile.hpp> #include <mbgl/platform/log.hpp> |