diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-06-06 16:18:46 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-06-06 23:31:51 +0300 |
| commit | b711979e328c54dbfd3240ea339a1662c7f9c808 (patch) | |
| tree | fdedd9c4f9873b090f4c69ac5ab77a97ddd558c9 /src/mbgl/sprite | |
| parent | f4a82bd367cc5a2134f37dec9979a7d653ef965c (diff) | |
| download | qtlocation-mapboxgl-b711979e328c54dbfd3240ea339a1662c7f9c808.tar.gz | |
[android] #5254 - fix ARMv5 support
Backported patches fixing ARMv5 support for issue #3985.
Diffstat (limited to 'src/mbgl/sprite')
| -rw-r--r-- | src/mbgl/sprite/sprite_atlas.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/sprite/sprite_atlas.hpp b/src/mbgl/sprite/sprite_atlas.hpp index 891f48fa24..b144855a17 100644 --- a/src/mbgl/sprite/sprite_atlas.hpp +++ b/src/mbgl/sprite/sprite_atlas.hpp @@ -3,6 +3,7 @@ #include <mbgl/geometry/binpack.hpp> #include <mbgl/gl/gl.hpp> #include <mbgl/gl/gl_object_store.hpp> +#include <mbgl/util/atomic.hpp> #include <mbgl/util/noncopyable.hpp> #include <mbgl/util/ptr.hpp> #include <mbgl/util/optional.hpp> @@ -10,7 +11,6 @@ #include <string> #include <map> #include <mutex> -#include <atomic> #include <set> #include <array> @@ -92,7 +92,7 @@ private: std::map<Key, Holder> images; std::set<std::string> uninitialized; std::unique_ptr<uint32_t[]> data; - std::atomic<bool> dirty; + util::Atomic<bool> dirty; bool fullUploadRequired = true; gl::TextureHolder texture; uint32_t filter = 0; |