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 /platform/android/src/async_task.cpp | |
| 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 'platform/android/src/async_task.cpp')
| -rw-r--r-- | platform/android/src/async_task.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/src/async_task.cpp b/platform/android/src/async_task.cpp index 6a9263baff..7b78eadb0c 100644 --- a/platform/android/src/async_task.cpp +++ b/platform/android/src/async_task.cpp @@ -1,9 +1,9 @@ #include "run_loop_impl.hpp" #include <mbgl/util/async_task.hpp> -#include <mbgl/util/atomic.hpp> #include <mbgl/util/run_loop.hpp> +#include <atomic> #include <functional> namespace mbgl { @@ -45,7 +45,7 @@ private: // TODO: Use std::atomic_flag if we ever drop // support for ARMv5 - util::Atomic<bool> queued; + std::atomic<bool> queued; std::function<void()> task; }; |