From 5d89f6cd928ba1f0a6541384337622ff663567de Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Wed, 10 May 2017 18:14:35 +0300
Subject: [core] Avoid calling virtual GeometryTile::cancel() on dtor

warning: Call to virtual function during destruction will not dispatch
to derived class [clang-analyzer-optin.cplusplus.VirtualCall]
---
 src/mbgl/tile/geometry_tile.cpp | 6 +++++-
 src/mbgl/tile/geometry_tile.hpp | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
index a8eda38284..5079a33340 100644
--- a/src/mbgl/tile/geometry_tile.cpp
+++ b/src/mbgl/tile/geometry_tile.cpp
@@ -47,10 +47,14 @@ GeometryTile::GeometryTile(const OverscaledTileID& id_,
 GeometryTile::~GeometryTile() {
     glyphAtlas.removeGlyphs(*this);
     spriteAtlas.removeRequestor(*this);
-    cancel();
+    markObsolete();
 }
 
 void GeometryTile::cancel() {
+    markObsolete();
+}
+
+void GeometryTile::markObsolete() {
     obsolete = true;
 }
 
diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp
index 594952d329..08965b6389 100644
--- a/src/mbgl/tile/geometry_tile.hpp
+++ b/src/mbgl/tile/geometry_tile.hpp
@@ -87,6 +87,8 @@ protected:
     }
 
 private:
+    void markObsolete();
+
     const std::string sourceID;
     style::Style& style;
 
-- 
cgit v1.2.1