1 files changed, 4 insertions, 11 deletions
diff --git a/platform/android/src/snapshotter/map_snapshotter.hpp b/platform/android/src/snapshotter/map_snapshotter.hpp
index 99c8b6d2df..c7c25faab4 100644
--- a/platform/android/src/snapshotter/map_snapshotter.hpp
+++ b/platform/android/src/snapshotter/map_snapshotter.hpp
@@ -3,6 +3,8 @@
 #include <jni/jni.hpp>
 #include <mbgl/map/map_snapshotter.hpp>
 #include <mbgl/util/util.hpp>
+#include <mapbox/weak.hpp>
+
 #include <memory>
 
 #include "../file_source.hpp"
@@ -63,16 +65,6 @@ public:
     void onStyleImageMissing(const std::string&) override;
 
 private:
-    struct DeleteOnThread {
-        DeleteOnThread();
-        explicit DeleteOnThread(mapbox::base::WeakPtr<mbgl::Scheduler>);
-        void operator()(mbgl::MapSnapshotter* p) const;
-
-    private:
-        mapbox::base::WeakPtr<mbgl::Scheduler> weakScheduler;
-    };
-
-private:
     MBGL_STORE_THREAD(tid);
 
     JavaVM *vm = nullptr;
@@ -85,7 +77,8 @@ private:
     void activateFilesource(JNIEnv&);
     void deactivateFilesource(JNIEnv&);
     bool activatedFilesource = false;
-    std::unique_ptr<mbgl::MapSnapshotter, DeleteOnThread> snapshotter;
+    mapbox::base::WeakPtr<mbgl::Scheduler> weakScheduler;
+    std::unique_ptr<mbgl::MapSnapshotter> snapshotter;
 };
 
 } // namespace android