Update Qt to mbgl::util::SimpleIdentity

mwilsnd · Jun 20, 2024 · 456f57f · 456f57f
1 parent 3afb348
commit 456f57f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/platform/default/src/mbgl/util/run_loop.cpp b/platform/default/src/mbgl/util/run_loop.cpp
@@ -149,7 +149,7 @@ void RunLoop::stop() {
     invoke([&] { uv_unref(impl->holderHandle()); });
 }
 
-void RunLoop::waitForEmpty([[maybe_unused]] const void* tag) {
+void RunLoop::waitForEmpty([[maybe_unused]] const mbgl::util::SimpleIdentity tag) {
     while (true) {
         std::size_t remaining;
         {

diff --git a/platform/qt/src/mbgl/run_loop.cpp b/platform/qt/src/mbgl/run_loop.cpp
@@ -91,7 +91,7 @@ void RunLoop::runOnce() {
     }
 }
 
-void RunLoop::waitForEmpty([[maybe_unused]] const void* tag) {
+void RunLoop::waitForEmpty([[maybe_unused]] const mbgl::util::SimpleIdentity tag) {
     while (true) {
         std::size_t remaining;
         {

diff --git a/platform/qt/src/utils/scheduler.cpp b/platform/qt/src/utils/scheduler.cpp
@@ -42,7 +42,7 @@ void Scheduler::processEvents() {
     cvEmpty.notify_all();
 }
 
-void Scheduler::waitForEmpty([[maybe_unused]] const void* tag) {
+void Scheduler::waitForEmpty([[maybe_unused]] const mbgl::util::SimpleIdentity tag) {
     MBGL_VERIFY_THREAD(tid);
 
     std::unique_lock<std::mutex> lock(m_taskQueueMutex);

diff --git a/platform/qt/src/utils/scheduler.hpp b/platform/qt/src/utils/scheduler.hpp
@@ -22,7 +22,7 @@ class Scheduler : public QObject, public mbgl::Scheduler {
     // mbgl::Scheduler implementation.
     void schedule(std::function<void()>&& function) final;
 
-    void waitForEmpty(const void* tag = nullptr) override;
+    void waitForEmpty(const mbgl::util::SimpleIdentity tag = mbgl::util::SimpleIdentity::Empty) override;
 
     mapbox::base::WeakPtr<mbgl::Scheduler> makeWeakPtr() override { return weakFactory.makeWeakPtr(); }