summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2015-11-06 16:06:58 -0800
committerJohn Firebaugh <john.firebaugh@gmail.com>2015-12-01 11:16:57 -0800
commit8a66b7047f899b781922986b63ecbe9039fcfafc (patch)
tree3a1c2b998270c7f1aa2fd753fbc1f62a02b831aa /src
parentb7674040ab768318c5accce50067550a7da4bea9 (diff)
downloadqtlocation-mapboxgl-8a66b7047f899b781922986b63ecbe9039fcfafc.tar.gz
[core] Remove mutex from Style
There's no cross-thread sharing to be protected here.
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/style/style.cpp2
-rw-r--r--src/mbgl/style/style.hpp2
2 files changed, 0 insertions, 4 deletions
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index b22aa546f7..eb4f5a05ae 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<std::mutex> 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 9afd933ffc..26b94d18f7 100644
--- a/src/mbgl/style/style.hpp
+++ b/src/mbgl/style/style.hpp
@@ -13,7 +13,6 @@
#include <mbgl/util/worker.hpp>
#include <cstdint>
-#include <mutex>
#include <string>
#include <vector>
@@ -137,7 +136,6 @@ private:
std::exception_ptr lastError;
- std::mutex mtx;
ZoomHistory zoomHistory;
bool hasPendingTransitions = false;