From cadb8d1da032148a05e586fd8ec61305fb519b11 Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart@emeel.net>
Date: Mon, 23 Sep 2024 17:16:18 +0200
Subject: [PATCH] Move WeakPtrFactory in `map_renderer.hpp` (#2861)

---
 include/mbgl/util/run_loop.hpp                            | 1 +
 platform/android/MapLibreAndroid/src/cpp/map_renderer.hpp | 4 +++-
 platform/qt/src/utils/scheduler.hpp                       | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/mbgl/util/run_loop.hpp b/include/mbgl/util/run_loop.hpp
index 16d6d6240..b3d0108f0 100644
--- a/include/mbgl/util/run_loop.hpp
+++ b/include/mbgl/util/run_loop.hpp
@@ -137,6 +137,7 @@ private:
 
     std::unique_ptr<Impl> impl;
     ::mapbox::base::WeakPtrFactory<Scheduler> weakFactory{this};
+    // Do not add members here, see `WeakPtrFactory`
 };
 
 } // namespace util
diff --git a/platform/android/MapLibreAndroid/src/cpp/map_renderer.hpp b/platform/android/MapLibreAndroid/src/cpp/map_renderer.hpp
index 9d706f54d..9fc962c0d 100644
--- a/platform/android/MapLibreAndroid/src/cpp/map_renderer.hpp
+++ b/platform/android/MapLibreAndroid/src/cpp/map_renderer.hpp
@@ -146,10 +146,12 @@ private:
     std::atomic<bool> destroyed{false};
 
     std::unique_ptr<SnapshotCallback> snapshotCallback;
-    mapbox::base::WeakPtrFactory<Scheduler> weakFactory{this};
 
     bool framebufferSizeChanged = false;
     bool swapBehaviorFlush = false;
+
+    mapbox::base::WeakPtrFactory<Scheduler> weakFactory{this};
+    // Do not add members here, see `WeakPtrFactory`
 };
 
 } // namespace android
diff --git a/platform/qt/src/utils/scheduler.hpp b/platform/qt/src/utils/scheduler.hpp
index 089acdbbf..99b26b7b7 100644
--- a/platform/qt/src/utils/scheduler.hpp
+++ b/platform/qt/src/utils/scheduler.hpp
@@ -39,6 +39,7 @@ private:
     std::atomic<std::size_t> pendingItems;
     std::queue<std::function<void()>> m_taskQueue;
     mapbox::base::WeakPtrFactory<Scheduler> weakFactory{this};
+    // Do not add members here, see `WeakPtrFactory`
 };
 
 } // namespace QMapLibre