From 8a66b7047f899b781922986b63ecbe9039fcfafc Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Fri, 6 Nov 2015 16:06:58 -0800 Subject: [PATCH] [core] Remove mutex from Style There's no cross-thread sharing to be protected here. --- src/mbgl/style/style.cpp | 2 -- src/mbgl/style/style.hpp | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index b22aa546f..eb4f5a05a 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -168,8 +168,6 @@ void Style::cascade() { } void Style::recalculate(float z) { - std::lock_guard lock(mtx); - for (const auto& source : sources) { source->enabled = false; } diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp index 9afd933ff..26b94d18f 100644 --- a/src/mbgl/style/style.hpp +++ b/src/mbgl/style/style.hpp @@ -13,7 +13,6 @@ #include #include -#include #include #include @@ -137,7 +136,6 @@ private: std::exception_ptr lastError; - std::mutex mtx; ZoomHistory zoomHistory; bool hasPendingTransitions = false;