diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-07-13 17:55:21 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-07-13 17:56:51 +0300 |
| commit | 389c7615eb70483b19f5917395f8cd505c08361b (patch) | |
| tree | aac1cda5d551d440f9aa6435c59fc7aa51b2012b /src/mbgl/sprite | |
| parent | b9c273d19713f9712dc06c90364fc78224fac351 (diff) | |
| download | qtlocation-mapboxgl-389c7615eb70483b19f5917395f8cd505c08361b.tar.gz | |
[core] Revert workaround for std::atomic on ARMv5
Got fix on r12.
https://github.com/android-ndk/ndk/issues/31
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 4f44eb9ac9..990ba59e03 100644 --- a/src/mbgl/sprite/sprite_atlas.hpp +++ b/src/mbgl/sprite/sprite_atlas.hpp @@ -3,11 +3,11 @@ #include <mbgl/geometry/binpack.hpp> #include <mbgl/gl/gl.hpp> #include <mbgl/gl/object_store.hpp> -#include <mbgl/util/atomic.hpp> #include <mbgl/util/noncopyable.hpp> #include <mbgl/util/ptr.hpp> #include <mbgl/util/optional.hpp> +#include <atomic> #include <string> #include <map> #include <mutex> @@ -92,7 +92,7 @@ private: std::map<Key, Holder> images; std::set<std::string> uninitialized; std::unique_ptr<uint32_t[]> data; - util::Atomic<bool> dirty; + std::atomic<bool> dirty; bool fullUploadRequired = true; mbgl::optional<gl::UniqueTexture> texture; uint32_t filter = 0; |