1 files changed, 12 insertions, 12 deletions

diff --git a/src/mbgl/style/custom_tile_loader.cpp b/src/mbgl/style/custom_tile_loader.cpp
index 1c587302b8..48fd5ae9e2 100644
--- a/src/mbgl/style/custom_tile_loader.cpp
+++ b/src/mbgl/style/custom_tile_loader.cpp
@@ -20,9 +20,9 @@ void CustomTileLoader::fetchTile(const OverscaledTileID& tileID, ActorRef<Custom
         auto tuple = std::make_tuple(tileID.overscaledZ, tileID.wrap, tileRef);
         tileCallbackMap.insert({ tileID.canonical, std::vector<OverscaledIDFunctionTuple>(1, tuple) });
     } else {
-        for (auto iter = tileCallbacks->second.begin(); iter != tileCallbacks->second.end(); iter++) {
-            if (std::get<0>(*iter) == tileID.overscaledZ && std::get<1>(*iter) == tileID.wrap ) {
-                std::get<2>(*iter) = tileRef;
+        for (auto& iter : tileCallbacks->second) {
+            if (std::get<0>(iter) == tileID.overscaledZ && std::get<1>(iter) == tileID.wrap ) {
+                std::get<2>(iter) = tileRef;
                 return;
             }
         }
@@ -70,8 +70,8 @@ void CustomTileLoader::setTileData(const CanonicalTileID& tileID, const GeoJSON&
 void CustomTileLoader::invalidateTile(const CanonicalTileID& tileID) {
     auto tileCallbacks = tileCallbackMap.find(tileID);
     if (tileCallbacks == tileCallbackMap.end()) { return; }
-    for (auto iter = tileCallbacks->second.begin(); iter != tileCallbacks->second.end(); iter++) {
-        auto actor = std::get<2>(*iter);
+    for (auto& iter : tileCallbacks->second) {
+        auto actor = std::get<2>(iter);
         actor.invoke(&CustomGeometryTile::invalidateTileData);
         invokeTileCancel(tileID);
     }
@@ -82,20 +82,20 @@ void CustomTileLoader::invalidateTile(const CanonicalTileID& tileID) {
 void CustomTileLoader::invalidateRegion(const LatLngBounds& bounds, Range<uint8_t> ) {
     std::map<uint8_t, util::TileRange> tileRanges;
 
-    for (auto idtuple= tileCallbackMap.begin(); idtuple != tileCallbackMap.end(); idtuple++) {
-        auto zoom = idtuple->first.z;
+    for (auto& idtuple : tileCallbackMap) {
+        auto zoom = idtuple.first.z;
         auto tileRange = tileRanges.find(zoom);
         if(tileRange == tileRanges.end()) {
             tileRange = tileRanges.emplace(std::make_pair(zoom, util::TileRange::fromLatLngBounds(bounds, zoom))).first;
         }
-        if (tileRange->second.contains(idtuple->first)) {
-            for (auto iter = idtuple->second.begin(); iter != idtuple->second.end(); iter++) {
+        if (tileRange->second.contains(idtuple.first)) {
+            for (auto iter = idtuple.second.begin(); iter != idtuple.second.end(); iter++) {
                 auto actor = std::get<2>(*iter);
                 actor.invoke(&CustomGeometryTile::invalidateTileData);
-                invokeTileCancel(idtuple->first);
-                dataCache.erase(idtuple->first);
+                invokeTileCancel(idtuple.first);
+                dataCache.erase(idtuple.first);
             }
-            idtuple->second.clear();
+            idtuple.second.clear();
         }
     }
 }