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/storage | |
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/storage')
-rw-r--r-- | src/mbgl/storage/network_status.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/storage/network_status.cpp b/src/mbgl/storage/network_status.cpp index bc538a5f38..1ef5619bd6 100644 --- a/src/mbgl/storage/network_status.cpp +++ b/src/mbgl/storage/network_status.cpp @@ -9,7 +9,7 @@ namespace mbgl { -util::Atomic<bool> NetworkStatus::online(true); +std::atomic<bool> NetworkStatus::online(true); std::mutex NetworkStatus::mtx; std::set<util::AsyncTask *> NetworkStatus::observers; |