[core] Use a getter for the BackendScope static variableupstream/tmpsantos-backend_scope_function

Fix a static variable initialization issue when dynamic loading
Mapbox GL Native.

1 files changed, 15 insertions, 7 deletions

diff --git a/src/mbgl/renderer/backend_scope.cpp b/src/mbgl/renderer/backend_scope.cpp
index fafeaabb39..ad430961aa 100644
--- a/src/mbgl/renderer/backend_scope.cpp
+++ b/src/mbgl/renderer/backend_scope.cpp
@@ -4,12 +4,20 @@
 
 #include <cassert>
 
-namespace mbgl {
+namespace {
+
+mbgl::util::ThreadLocal<mbgl::BackendScope>& currentScope() {
+    static mbgl::util::ThreadLocal<mbgl::BackendScope> backendScope;
+
+    return backendScope;
+}
+
+} // namespace
 
-static util::ThreadLocal<BackendScope> currentScope;
+namespace mbgl {
 
 BackendScope::BackendScope(RendererBackend& backend_, ScopeType scopeType_)
-    : priorScope(currentScope.get()),
+    : priorScope(currentScope().get()),
       nextScope(nullptr),
       backend(backend_),
       scopeType(scopeType_) {
@@ -21,7 +29,7 @@ BackendScope::BackendScope(RendererBackend& backend_, ScopeType scopeType_)
 
     activate();
 
-    currentScope.set(this);
+    currentScope().set(this);
 }
 
 BackendScope::~BackendScope() {
@@ -30,11 +38,11 @@ BackendScope::~BackendScope() {
 
     if (priorScope) {
         priorScope->activate();
-        currentScope.set(priorScope);
+        currentScope().set(priorScope);
         assert(priorScope->nextScope == this);
         priorScope->nextScope = nullptr;
     } else {
-        currentScope.set(nullptr);
+        currentScope().set(nullptr);
     }
 }
 
@@ -60,7 +68,7 @@ void BackendScope::deactivate() {
 }
 
 bool BackendScope::exists() {
-    return currentScope.get();
+    return currentScope().get();
 }
 
 } // namespace mbgl