From 49120b1974edf744939f7801068dde612d79a4d7 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 6 Jun 2016 19:05:32 -0700
Subject: [core] Merge FileBasedTileSource and TileSource

---
 src/mbgl/tile/vector_tile_data.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mbgl/tile/vector_tile_data.hpp')

diff --git a/src/mbgl/tile/vector_tile_data.hpp b/src/mbgl/tile/vector_tile_data.hpp
index d7a14314d2..8e653386b8 100644
--- a/src/mbgl/tile/vector_tile_data.hpp
+++ b/src/mbgl/tile/vector_tile_data.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <mbgl/tile/geometry_tile_data.hpp>
+#include <mbgl/tile/tile_source.hpp>
 
 namespace mbgl {
 
 class Tileset;
-class TileSource;
 class GeometryTile;
 
 namespace style {
@@ -25,7 +25,7 @@ public:
     static std::unique_ptr<GeometryTile> parseData(std::shared_ptr<const std::string>);
 
 private:
-    std::unique_ptr<TileSource> tileSource;
+    TileSource<VectorTileData> tileSource;
 };
 
 } // namespace mbgl
-- 
cgit v1.2.1