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/tile/geometry_tile.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/tile/geometry_tile.hpp')
| -rw-r--r-- | src/mbgl/tile/geometry_tile.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp index 6072e2b1da..891aba0432 100644 --- a/src/mbgl/tile/geometry_tile.hpp +++ b/src/mbgl/tile/geometry_tile.hpp @@ -3,9 +3,9 @@ #include <mbgl/tile/tile.hpp> #include <mbgl/tile/tile_worker.hpp> #include <mbgl/text/placement_config.hpp> -#include <mbgl/util/atomic.hpp> #include <mbgl/util/feature.hpp> +#include <atomic> #include <memory> #include <unordered_map> #include <vector> @@ -73,7 +73,7 @@ private: PlacementConfig targetConfig; // Used to signal the worker that it should abandon parsing this tile as soon as possible. - util::Atomic<bool> obsolete { false }; + std::atomic<bool> obsolete { false }; }; } // namespace mbgl |