[core] retain tiles differently and remove old TileID class

1 files changed, 8 insertions, 4 deletions

diff --git a/src/mbgl/tile/tile.hpp b/src/mbgl/tile/tile.hpp
index 5cb23f58f3..78df995157 100644
--- a/src/mbgl/tile/tile.hpp
+++ b/src/mbgl/tile/tile.hpp
@@ -3,7 +3,6 @@
 
 #include <mbgl/tile/tile_id.hpp>
 #include <mbgl/util/mat4.hpp>
-#include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/ptr.hpp>
 #include <mbgl/util/clip_id.hpp>
 
@@ -12,15 +11,20 @@ namespace mbgl {
 class TileData;
 struct box;
 
-class Tile : private util::noncopyable {
+class Tile {
 public:
-    Tile(const UnwrappedTileID& id_) : id(id_) {
+    Tile(const UnwrappedTileID& id_, TileData& data_) : id(id_), data(data_) {
     }
 
+    Tile(const Tile&) = delete;
+    Tile(Tile&&) = default;
+    Tile& operator=(const Tile&) = delete;
+    Tile& operator=(Tile&&) = default;
+
     const UnwrappedTileID id;
+    TileData& data;
     ClipID clip;
     mat4 matrix;
-    util::ptr<TileData> data;
 };
 
 } // namespace mbgl