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