From f028525df704681e97004a8c9a5e67da5b3efa95 Mon Sep 17 00:00:00 2001
From: Asheem Mamoowala <asheem.mamoowala@mapbox.com>
Date: Mon, 2 Oct 2017 18:44:02 -0700
Subject: Build fix: CustomTile::setTileData::data shadows GeometryTile::data

---
 src/mbgl/tile/custom_tile.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mbgl/tile/custom_tile.cpp b/src/mbgl/tile/custom_tile.cpp
index c462e95d0f..db9efaab95 100644
--- a/src/mbgl/tile/custom_tile.cpp
+++ b/src/mbgl/tile/custom_tile.cpp
@@ -30,7 +30,7 @@ CustomTile::~CustomTile() {
 
 void CustomTile::setTileData(const CanonicalTileID&, const mapbox::geojson::geojson& geoJSON) {
     
-    auto data = mapbox::geometry::feature_collection<int16_t>();
+    auto featureData = mapbox::geometry::feature_collection<int16_t>();
     if (geoJSON.is<FeatureCollection>() && !geoJSON.get<FeatureCollection>().empty()) {
         const double scale = util::EXTENT / options.tileSize;
 
@@ -40,9 +40,9 @@ void CustomTile::setTileData(const CanonicalTileID&, const mapbox::geojson::geoj
         vtOptions.buffer = std::round(scale * options.buffer);
         vtOptions.tolerance = scale * options.tolerance;
         auto geojsonVt = std::make_unique<mapbox::geojsonvt::GeoJSONVT>(geoJSON, vtOptions);
-        data = geojsonVt->getTile(id.canonical.z, id.canonical.x, id.canonical.y).features;
+        featureData = geojsonVt->getTile(id.canonical.z, id.canonical.x, id.canonical.y).features;
     }
-    setData(std::make_unique<GeoJSONTileData>(std::move(data)));
+    setData(std::make_unique<GeoJSONTileData>(std::move(featureData)));
 }
 
 void CustomTile::setNecessity(Necessity newNecessity) {
-- 
cgit v1.2.1