fix variable shadowing

2014-10-22 18:06:11 +02:00
parent 74387c54e3
commit 214f99673f
60 changed files with 276 additions and 278 deletions
--- a/src/map/tile_parser.cpp
+++ b/src/map/tile_parser.cpp
@@ -37,14 +37,14 @@ namespace mbgl {
 // its header file.
 TileParser::~TileParser() = default;

-TileParser::TileParser(const std::string &data, VectorTileData &tile,
+TileParser::TileParser(const std::string &data, VectorTileData &tile_,
                       const util::ptr<const Style> &style_,
                       const util::ptr<GlyphAtlas> &glyphAtlas_,
                       const util::ptr<GlyphStore> &glyphStore_,
                       const util::ptr<SpriteAtlas> &spriteAtlas_,
                       const util::ptr<Sprite> &sprite_)
    : vector_data(pbf((const uint8_t *)data.data(), data.size())),
-      tile(tile),
+      tile(tile_),
      style(style_),
      glyphAtlas(glyphAtlas_),
      glyphStore(glyphStore_),