summaryrefslogtreecommitdiff
path: root/include/mbgl/storage
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <thiago@mapbox.com>2016-07-13 17:55:21 +0300
committerThiago Marcos P. Santos <thiago@mapbox.com>2016-07-13 17:56:51 +0300
commit389c7615eb70483b19f5917395f8cd505c08361b (patch)
treeaac1cda5d551d440f9aa6435c59fc7aa51b2012b /include/mbgl/storage
parentb9c273d19713f9712dc06c90364fc78224fac351 (diff)
downloadqtlocation-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 'include/mbgl/storage')
-rw-r--r--include/mbgl/storage/network_status.hpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/mbgl/storage/network_status.hpp b/include/mbgl/storage/network_status.hpp
index 1b5471a44e..d7f502a3b2 100644
--- a/include/mbgl/storage/network_status.hpp
+++ b/include/mbgl/storage/network_status.hpp
@@ -1,7 +1,6 @@
#pragma once
-#include <mbgl/util/atomic.hpp>
-
+#include <atomic>
#include <mutex>
#include <set>
@@ -27,7 +26,7 @@ public:
static void Unsubscribe(util::AsyncTask* async);
private:
- static util::Atomic<bool> online;
+ static std::atomic<bool> online;
static std::mutex mtx;
static std::set<util::AsyncTask*> observers;
};