From 06d9f8f4bbc395a90ad74e38cfbfd88458c0b15a Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 7 Jun 2016 12:19:25 -0700 Subject: [PATCH] [core] Remove unnecessary explicit destructors --- src/mbgl/tile/raster_tile_data.cpp | 4 ---- src/mbgl/tile/raster_tile_data.hpp | 1 - src/mbgl/tile/vector_tile_data.cpp | 2 -- src/mbgl/tile/vector_tile_data.hpp | 1 - 4 files changed, 8 deletions(-) diff --git a/src/mbgl/tile/raster_tile_data.cpp b/src/mbgl/tile/raster_tile_data.cpp index 67cf1a089..7737f1fb7 100644 --- a/src/mbgl/tile/raster_tile_data.cpp +++ b/src/mbgl/tile/raster_tile_data.cpp @@ -55,10 +55,6 @@ void RasterTileData::setData(std::shared_ptr data, }); } -RasterTileData::~RasterTileData() { - cancel(); -} - Bucket* RasterTileData::getBucket(const style::Layer&) { return bucket.get(); } diff --git a/src/mbgl/tile/raster_tile_data.hpp b/src/mbgl/tile/raster_tile_data.hpp index ef9e29c0d..7c224ad81 100644 --- a/src/mbgl/tile/raster_tile_data.hpp +++ b/src/mbgl/tile/raster_tile_data.hpp @@ -21,7 +21,6 @@ public: RasterTileData(const OverscaledTileID&, const style::UpdateParameters&, const Tileset&); - ~RasterTileData(); void setNecessity(Necessity) final; diff --git a/src/mbgl/tile/vector_tile_data.cpp b/src/mbgl/tile/vector_tile_data.cpp index b2bb5e211..e113054af 100644 --- a/src/mbgl/tile/vector_tile_data.cpp +++ b/src/mbgl/tile/vector_tile_data.cpp @@ -15,8 +15,6 @@ VectorTileData::VectorTileData(const OverscaledTileID& id_, tileSource(*this, id_, parameters, tileset) { } -VectorTileData::~VectorTileData() = default; - void VectorTileData::setNecessity(Necessity necessity) { tileSource.setNecessity(static_cast::Necessity>(necessity)); } diff --git a/src/mbgl/tile/vector_tile_data.hpp b/src/mbgl/tile/vector_tile_data.hpp index a9ea08674..1d44abaec 100644 --- a/src/mbgl/tile/vector_tile_data.hpp +++ b/src/mbgl/tile/vector_tile_data.hpp @@ -18,7 +18,6 @@ public: std::string sourceID, const style::UpdateParameters&, const Tileset&); - ~VectorTileData(); void setNecessity(Necessity) final; void setData(std::shared_ptr data,