From 2cdbb49a0c7253aa38da8e02dff921d78dc2de49 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 19 Jul 2017 12:52:33 -0700 Subject: =?UTF-8?q?[core]=20Fix=20build;=20struct=20=E2=87=A2=20class?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/mbgl/renderer/renderer.hpp | 2 +- include/mbgl/renderer/renderer_frontend.hpp | 2 +- src/mbgl/annotation/annotation_tile.hpp | 2 +- src/mbgl/renderer/render_source.hpp | 2 +- src/mbgl/renderer/render_style.hpp | 2 +- src/mbgl/renderer/tile_parameters.hpp | 3 ++- src/mbgl/renderer/tile_pyramid.hpp | 2 +- src/mbgl/renderer/update_parameters.hpp | 3 ++- src/mbgl/tile/geojson_tile.hpp | 2 +- src/mbgl/tile/geometry_tile.hpp | 2 +- src/mbgl/tile/raster_tile.hpp | 2 +- src/mbgl/tile/tile_loader.hpp | 2 +- src/mbgl/tile/vector_tile.hpp | 2 +- 13 files changed, 15 insertions(+), 13 deletions(-) diff --git a/include/mbgl/renderer/renderer.hpp b/include/mbgl/renderer/renderer.hpp index e6cbef02f3..083102acbe 100644 --- a/include/mbgl/renderer/renderer.hpp +++ b/include/mbgl/renderer/renderer.hpp @@ -19,7 +19,7 @@ class RendererObserver; class RenderedQueryOptions; class Scheduler; class SourceQueryOptions; -struct UpdateParameters; +class UpdateParameters; class View; class Renderer { diff --git a/include/mbgl/renderer/renderer_frontend.hpp b/include/mbgl/renderer/renderer_frontend.hpp index 2eac1a55c3..f72b0ccdde 100644 --- a/include/mbgl/renderer/renderer_frontend.hpp +++ b/include/mbgl/renderer/renderer_frontend.hpp @@ -5,7 +5,7 @@ namespace mbgl { class RendererObserver; -struct UpdateParameters; +class UpdateParameters; // The RenderFrontend is the bridge between the Map and // platform used to update and observer the Renderer diff --git a/src/mbgl/annotation/annotation_tile.hpp b/src/mbgl/annotation/annotation_tile.hpp index b268db611d..88505c50e3 100644 --- a/src/mbgl/annotation/annotation_tile.hpp +++ b/src/mbgl/annotation/annotation_tile.hpp @@ -7,7 +7,7 @@ namespace mbgl { class AnnotationManager; -struct TileParameters; +class TileParameters; class AnnotationTile : public GeometryTile { public: diff --git a/src/mbgl/renderer/render_source.hpp b/src/mbgl/renderer/render_source.hpp index f329035086..b565439588 100644 --- a/src/mbgl/renderer/render_source.hpp +++ b/src/mbgl/renderer/render_source.hpp @@ -24,7 +24,7 @@ class RenderedQueryOptions; class SourceQueryOptions; class Tile; class RenderSourceObserver; -struct TileParameters; +class TileParameters; class RenderSource : protected TileObserver { public: diff --git a/src/mbgl/renderer/render_style.hpp b/src/mbgl/renderer/render_style.hpp index 85d8091d12..23a640c482 100644 --- a/src/mbgl/renderer/render_style.hpp +++ b/src/mbgl/renderer/render_style.hpp @@ -23,7 +23,7 @@ class RenderData; class TransformState; class RenderedQueryOptions; class Scheduler; -struct UpdateParameters; +class UpdateParameters; class RenderStyleObserver; namespace style { diff --git a/src/mbgl/renderer/tile_parameters.hpp b/src/mbgl/renderer/tile_parameters.hpp index dac320db12..665c7490d2 100644 --- a/src/mbgl/renderer/tile_parameters.hpp +++ b/src/mbgl/renderer/tile_parameters.hpp @@ -11,7 +11,8 @@ class AnnotationManager; class ImageManager; class GlyphManager; -struct TileParameters { +class TileParameters { +public: const float pixelRatio; const MapDebugOptions debugOptions; const TransformState& transformState; diff --git a/src/mbgl/renderer/tile_pyramid.hpp b/src/mbgl/renderer/tile_pyramid.hpp index 4a77419c2c..d940f378fa 100644 --- a/src/mbgl/renderer/tile_pyramid.hpp +++ b/src/mbgl/renderer/tile_pyramid.hpp @@ -24,7 +24,7 @@ class RenderTile; class RenderStyle; class RenderedQueryOptions; class SourceQueryOptions; -struct TileParameters; +class TileParameters; class TilePyramid { public: diff --git a/src/mbgl/renderer/update_parameters.hpp b/src/mbgl/renderer/update_parameters.hpp index bb7b7894cb..181b11784d 100644 --- a/src/mbgl/renderer/update_parameters.hpp +++ b/src/mbgl/renderer/update_parameters.hpp @@ -17,7 +17,8 @@ class Scheduler; class FileSource; class AnnotationManager; -struct UpdateParameters { +class UpdateParameters { +public: const bool styleLoaded; const MapMode mode; const float pixelRatio; diff --git a/src/mbgl/tile/geojson_tile.hpp b/src/mbgl/tile/geojson_tile.hpp index 2ba459da21..d8a0a379d7 100644 --- a/src/mbgl/tile/geojson_tile.hpp +++ b/src/mbgl/tile/geojson_tile.hpp @@ -5,7 +5,7 @@ namespace mbgl { -struct TileParameters; +class TileParameters; class GeoJSONTile : public GeometryTile { public: diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp index 1ffc354de6..c45762742b 100644 --- a/src/mbgl/tile/geometry_tile.hpp +++ b/src/mbgl/tile/geometry_tile.hpp @@ -22,7 +22,7 @@ class GeometryTileData; class RenderStyle; class RenderLayer; class SourceQueryOptions; -struct TileParameters; +class TileParameters; class GlyphAtlas; class ImageAtlas; diff --git a/src/mbgl/tile/raster_tile.hpp b/src/mbgl/tile/raster_tile.hpp index d8b057c4ac..51075a2dbc 100644 --- a/src/mbgl/tile/raster_tile.hpp +++ b/src/mbgl/tile/raster_tile.hpp @@ -8,7 +8,7 @@ namespace mbgl { class Tileset; -struct TileParameters; +class TileParameters; namespace style { class Layer; diff --git a/src/mbgl/tile/tile_loader.hpp b/src/mbgl/tile/tile_loader.hpp index b81121a27e..bc408ebaf6 100644 --- a/src/mbgl/tile/tile_loader.hpp +++ b/src/mbgl/tile/tile_loader.hpp @@ -10,7 +10,7 @@ class FileSource; class AsyncRequest; class Response; class Tileset; -struct TileParameters; +class TileParameters; template class TileLoader : private util::noncopyable { diff --git a/src/mbgl/tile/vector_tile.hpp b/src/mbgl/tile/vector_tile.hpp index d6d3c54e34..566cde4f37 100644 --- a/src/mbgl/tile/vector_tile.hpp +++ b/src/mbgl/tile/vector_tile.hpp @@ -6,7 +6,7 @@ namespace mbgl { class Tileset; -struct TileParameters; +class TileParameters; class VectorTile : public GeometryTile { public: -- cgit v1.2.1