From 3afbfa2de74d26f1d9099a85cc1b6ed70251666f Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Tue, 11 Jul 2017 15:16:06 +0300
Subject: [core] GCC 4.9 shadow member warnings

---
 src/mbgl/renderer/possibly_evaluated_property_value.hpp | 2 +-
 src/mbgl/tile/geometry_tile.cpp                         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/mbgl/renderer/possibly_evaluated_property_value.hpp b/src/mbgl/renderer/possibly_evaluated_property_value.hpp
index 8a5dfbe4ea..e662d5dfb1 100644
--- a/src/mbgl/renderer/possibly_evaluated_property_value.hpp
+++ b/src/mbgl/renderer/possibly_evaluated_property_value.hpp
@@ -45,7 +45,7 @@ public:
     template <class Feature>
     T evaluate(const Feature& feature, float zoom, T defaultValue) const {
         return this->match(
-                [&] (const T& constant) { return constant; },
+                [&] (const T& constant_) { return constant_; },
                 [&] (const style::SourceFunction<T>& function) {
                     return function.evaluate(feature, defaultValue);
                 },
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) {
-- 
cgit v1.2.1