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/map.cpp | |
parent | 74387c54e35e0f8f6bf1dcc7b7b171a3ec6db212 (diff) | |
download | qtlocation-mapboxgl-214f99673f6f7480f9cc3bf9d6fa32ef8dd2ede5.tar.gz |
fix variable shadowing
Diffstat (limited to 'src/map/map.cpp')
-rw-r--r-- | src/map/map.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/map/map.cpp b/src/map/map.cpp index 451385d3d5..a7520b2517 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -30,17 +30,17 @@ using namespace mbgl; -Map::Map(View& view) +Map::Map(View& view_) : loop(std::make_shared<uv::loop>()), thread(std::make_unique<uv::thread>()), async_terminate(new uv_async_t()), async_render(new uv_async_t()), async_cleanup(new uv_async_t()), - view(view), + view(view_), #ifndef NDEBUG main_thread(uv_thread_self()), #endif - transform(view), + transform(view_), glyphAtlas(std::make_shared<GlyphAtlas>(1024, 1024)), spriteAtlas(std::make_shared<SpriteAtlas>(512, 512)), texturepool(std::make_shared<Texturepool>()), @@ -653,9 +653,6 @@ void Map::prepare() { void Map::render() { view.make_active(); -#if defined(DEBUG) - std::vector<std::string> debug; -#endif painter.clear(); painter.resize(); |