summaryrefslogtreecommitdiff
path: root/src/mbgl/tile
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2017-07-11 15:16:06 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2017-07-12 20:42:29 +0300
commit3afbfa2de74d26f1d9099a85cc1b6ed70251666f (patch)
treebb71b54e4badf6d71932e31fa89e4c7348c7a0cd /src/mbgl/tile
parentf1ac757bd28351fd57113a1e16f6c2e00ab193c1 (diff)
downloadqtlocation-mapboxgl-3afbfa2de74d26f1d9099a85cc1b6ed70251666f.tar.gz
[core] GCC 4.9 shadow member warnings
Diffstat (limited to 'src/mbgl/tile')
-rw-r--r--src/mbgl/tile/geometry_tile.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
index 1ee303b50f..4f1bc9e759 100644
--- a/src/mbgl/tile/geometry_tile.cpp
+++ b/src/mbgl/tile/geometry_tile.cpp
@@ -174,18 +174,18 @@ void GeometryTile::getImages(ImageDependencies imageDependencies) {
}
void GeometryTile::upload(gl::Context& context) {
- auto upload = [&] (Bucket& bucket) {
+ auto uploadFn = [&] (Bucket& bucket) {
if (bucket.needsUpload()) {
bucket.upload(context);
}
};
for (auto& entry : nonSymbolBuckets) {
- upload(*entry.second);
+ uploadFn(*entry.second);
}
for (auto& entry : symbolBuckets) {
- upload(*entry.second);
+ uploadFn(*entry.second);
}
if (glyphAtlasImage) {