diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-08-12 15:12:03 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-08-12 15:12:31 +0200 |
| commit | 213b6ad4dc5bec3f561486422e5b5686cd988696 (patch) | |
| tree | 46eee7723e938dc9f7e1df2acd12ff6fb2efabd4 /include/mbgl/style | |
| parent | 0263a9ffb7afc4f48e84b3fe3e0263cf32f739f5 (diff) | |
| parent | bdfc1036d3b0148fa0f57a277f7686b4b38e2071 (diff) | |
| download | qtlocation-mapboxgl-213b6ad4dc5bec3f561486422e5b5686cd988696.tar.gz | |
Merge branch 'master' into rasterize
[skip ci]
Diffstat (limited to 'include/mbgl/style')
| -rw-r--r-- | include/mbgl/style/style.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mbgl/style/style.hpp b/include/mbgl/style/style.hpp index 3df58ab42b..1f24674e42 100644 --- a/include/mbgl/style/style.hpp +++ b/include/mbgl/style/style.hpp @@ -62,7 +62,7 @@ private: PropertyTransition defaultTransition; bool initial_render_complete = false; - mutable uv::rwlock mtx; + std::unique_ptr<uv::rwlock> mtx; }; } |