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/renderer/bucket.hpp | |
| 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/renderer/bucket.hpp')
| -rw-r--r-- | src/mbgl/renderer/bucket.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mbgl/renderer/bucket.hpp b/src/mbgl/renderer/bucket.hpp index 635c83e3c0..cf461e4389 100644 --- a/src/mbgl/renderer/bucket.hpp +++ b/src/mbgl/renderer/bucket.hpp @@ -2,9 +2,10 @@ #include <mbgl/gl/gl.hpp> #include <mbgl/renderer/render_pass.hpp> -#include <mbgl/util/atomic.hpp> #include <mbgl/util/noncopyable.hpp> +#include <atomic> + #define BUFFER_OFFSET_0 ((GLbyte*)nullptr) #define BUFFER_OFFSET(i) ((BUFFER_OFFSET_0) + (i)) @@ -50,7 +51,7 @@ public: virtual void swapRenderData() {} protected: - util::Atomic<bool> uploaded { false }; + std::atomic<bool> uploaded { false }; }; } // namespace mbgl |