From 6488f55a5727202ecd9d8e487ba04d4da64b311c Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart.louwers@gmail.com>
Date: Mon, 23 Sep 2024 16:17:49 +0200
Subject: [PATCH 1/2] Use thread_local for thread local scheduler

---
 src/mbgl/actor/scheduler.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/mbgl/actor/scheduler.cpp b/src/mbgl/actor/scheduler.cpp
index f2f70bd79b2..c68dad1be65 100644
--- a/src/mbgl/actor/scheduler.cpp
+++ b/src/mbgl/actor/scheduler.cpp
@@ -14,18 +14,16 @@ std::function<void()> Scheduler::bindOnce(std::function<void()> fn) {
 }
 
 namespace {
-auto& current() {
-    static util::ThreadLocal<Scheduler> scheduler;
-    return scheduler;
-}
+
+thread_local Scheduler *localScheduler;
 } // namespace
 
 void Scheduler::SetCurrent(Scheduler* scheduler) {
-    current().set(scheduler);
+    localScheduler = scheduler;
 }
 
 Scheduler* Scheduler::GetCurrent() {
-    return current().get();
+    return localScheduler;
 }
 
 // static

From e85ffe14380eec3a5378502d88b2d22ed9c4bd73 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 14:20:01 +0000
Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 src/mbgl/actor/scheduler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mbgl/actor/scheduler.cpp b/src/mbgl/actor/scheduler.cpp
index c68dad1be65..515a777848e 100644
--- a/src/mbgl/actor/scheduler.cpp
+++ b/src/mbgl/actor/scheduler.cpp
@@ -15,7 +15,7 @@ std::function<void()> Scheduler::bindOnce(std::function<void()> fn) {
 
 namespace {
 
-thread_local Scheduler *localScheduler;
+thread_local Scheduler* localScheduler;
 } // namespace
 
 void Scheduler::SetCurrent(Scheduler* scheduler) {