diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-22 18:06:11 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-22 18:19:01 +0200 |
| commit | 214f99673f6f7480f9cc3bf9d6fa32ef8dd2ede5 (patch) | |
| tree | f06145cf70bf7860abd2c6edf88e2294d4ecb830 /src/map/tile_data.cpp | |
| parent | 74387c54e35e0f8f6bf1dcc7b7b171a3ec6db212 (diff) | |
| download | qtlocation-mapboxgl-214f99673f6f7480f9cc3bf9d6fa32ef8dd2ede5.tar.gz | |
fix variable shadowing
Diffstat (limited to 'src/map/tile_data.cpp')
| -rw-r--r-- | src/map/tile_data.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/tile_data.cpp b/src/map/tile_data.cpp index 44e3826bf5..7e4d1a1de1 100644 --- a/src/map/tile_data.cpp +++ b/src/map/tile_data.cpp @@ -9,14 +9,14 @@ using namespace mbgl; -TileData::TileData(Tile::ID id, Map &map, const util::ptr<SourceInfo> &source) - : id(id), +TileData::TileData(Tile::ID id_, Map &map_, const util::ptr<SourceInfo> &source_) + : id(id_), state(State::initial), - map(map), - source(source), + map(map_), + source(source_), debugBucket(debugFontBuffer) { // Initialize tile debug coordinates - const std::string str = util::sprintf<32>("%d/%d/%d", id.z, id.x, id.y); + const std::string str = util::sprintf<32>("%d/%d/%d", id_.z, id_.x, id_.y); debugFontBuffer.addText(str.c_str(), 50, 200, 5); } |