diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-08-12 13:16:20 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-08-12 13:16:20 +0200 |
| commit | 9b9ad20a90f55ffb31bad71d724845d9e5511a4f (patch) | |
| tree | 5bd92a12f93b75f6d70df6e18bbcb29e838ecca0 /src/style/style.cpp | |
| parent | fae1c157f6fe15097bb3ca663dd62775ed608622 (diff) | |
| parent | bdfc1036d3b0148fa0f57a277f7686b4b38e2071 (diff) | |
| download | qtlocation-mapboxgl-9b9ad20a90f55ffb31bad71d724845d9e5511a4f.tar.gz | |
Merge branch 'master' into style-parser-test
Conflicts:
mapboxgl.gyp
Diffstat (limited to 'src/style/style.cpp')
| -rw-r--r-- | src/style/style.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/style/style.cpp b/src/style/style.cpp index 03881f96a0..22c7610105 100644 --- a/src/style/style.cpp +++ b/src/style/style.cpp @@ -6,6 +6,8 @@ #include <mbgl/util/constants.hpp> #include <mbgl/util/time.hpp> #include <mbgl/util/error.hpp> +#include <mbgl/util/std.hpp> +#include <mbgl/util/uv_detail.hpp> #include <csscolorparser/csscolorparser.hpp> #include <rapidjson/document.h> @@ -13,7 +15,8 @@ namespace mbgl { -Style::Style() { +Style::Style() + : mtx(std::make_unique<uv::rwlock>()) { } void Style::updateProperties(float z, timestamp now) { |