diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2014-10-22 16:03:58 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2014-10-29 09:58:56 -0400 |
commit | 8ae0dcb5a46acb7a268fbc1086b5aeebb0b6da4c (patch) | |
tree | a31c47a09f527935e35965ee12ecd09a656bd0c2 /include | |
parent | da8aa391d0a1079bbc697207803a48fce8ab916f (diff) | |
download | qtlocation-mapboxgl-8ae0dcb5a46acb7a268fbc1086b5aeebb0b6da4c.tar.gz |
Replace uv::rwlock with std::recursive_mutex
Fixes #491
Diffstat (limited to 'include')
-rw-r--r-- | include/mbgl/map/transform.hpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/mbgl/map/transform.hpp b/include/mbgl/map/transform.hpp index 4801ff1098..e3604edd8b 100644 --- a/include/mbgl/map/transform.hpp +++ b/include/mbgl/map/transform.hpp @@ -3,14 +3,12 @@ #include <mbgl/util/time.hpp> #include <mbgl/map/transform_state.hpp> - #include <mbgl/util/noncopyable.hpp> -#include <mbgl/util/uv.hpp> #include <cstdint> #include <cmath> #include <forward_list> -#include <memory> +#include <mutex> namespace mbgl { @@ -80,7 +78,7 @@ private: private: View &view; - std::unique_ptr<uv::rwlock> mtx; + mutable std::recursive_mutex mtx; // This reflects the current state of the transform, representing the actual position of the // map. After calling a transform function with a timer, this will likely remain the same until |