summaryrefslogtreecommitdiff
path: root/src/mbgl/style/sources/geojson_source.cpp
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2019-12-12 16:44:41 +0200
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2019-12-12 17:44:11 +0200
commit3bbea2e30c2a7942d16586c5dea770cccfba5ae0 (patch)
treefbd294d00afd3d773cab55c2f10379f29f03a6d7 /src/mbgl/style/sources/geojson_source.cpp
parent79768743d8d9f61303d653a515ed1d218b6e54f4 (diff)
downloadqtlocation-mapboxgl-3bbea2e30c2a7942d16586c5dea770cccfba5ae0.tar.gz
[core] Fix -Wshadow when using GCC 4.9
Diffstat (limited to 'src/mbgl/style/sources/geojson_source.cpp')
-rw-r--r--src/mbgl/style/sources/geojson_source.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/style/sources/geojson_source.cpp b/src/mbgl/style/sources/geojson_source.cpp
index ea6fb5cc68..7767859b38 100644
--- a/src/mbgl/style/sources/geojson_source.cpp
+++ b/src/mbgl/style/sources/geojson_source.cpp
@@ -78,16 +78,16 @@ void GeoJSONSource::loadDescription(FileSource& fileSource) {
} else {
auto makeImplInBackground = [currentImpl = baseImpl, data = res.data]() -> Immutable<Source::Impl> {
assert(data);
- auto& impl = static_cast<const Impl&>(*currentImpl);
+ auto& current = static_cast<const Impl&>(*currentImpl);
conversion::Error error;
std::shared_ptr<GeoJSONData> geoJSONData;
if (optional<GeoJSON> geoJSON = conversion::convertJSON<GeoJSON>(*data, error)) {
- geoJSONData = GeoJSONData::create(*geoJSON, impl.getOptions());
+ geoJSONData = GeoJSONData::create(*geoJSON, current.getOptions());
} else {
// Create an empty GeoJSON VT object to make sure we're not infinitely waiting for tiles to load.
Log::Error(Event::ParseStyle, "Failed to parse GeoJSON data: %s", error.message.c_str());
}
- return makeMutable<Impl>(impl, std::move(geoJSONData));
+ return makeMutable<Impl>(current, std::move(geoJSONData));
};
auto onImplReady = [this, self = makeWeakPtr(), capturedReq = req.get()](Immutable<Source::Impl> newImpl) {
assert(capturedReq);