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 | |
| 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')
| -rw-r--r-- | src/mbgl/tile/geometry_tile.hpp | 4 | ||||
| -rw-r--r-- | src/mbgl/tile/tile_worker.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/tile/tile_worker.hpp | 6 |
3 files changed, 6 insertions, 6 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 diff --git a/src/mbgl/tile/tile_worker.cpp b/src/mbgl/tile/tile_worker.cpp index fe75c86741..5761ca83b9 100644 --- a/src/mbgl/tile/tile_worker.cpp +++ b/src/mbgl/tile/tile_worker.cpp @@ -22,7 +22,7 @@ TileWorker::TileWorker(OverscaledTileID id_, SpriteStore& spriteStore_, GlyphAtlas& glyphAtlas_, GlyphStore& glyphStore_, - const util::Atomic<bool>& obsolete_, + const std::atomic<bool>& obsolete_, const MapMode mode_) : id(std::move(id_)), spriteStore(spriteStore_), diff --git a/src/mbgl/tile/tile_worker.hpp b/src/mbgl/tile/tile_worker.hpp index b25858c955..872c058b43 100644 --- a/src/mbgl/tile/tile_worker.hpp +++ b/src/mbgl/tile/tile_worker.hpp @@ -2,13 +2,13 @@ #include <mbgl/map/mode.hpp> #include <mbgl/tile/tile_id.hpp> -#include <mbgl/util/atomic.hpp> #include <mbgl/util/noncopyable.hpp> #include <mbgl/util/variant.hpp> #include <mbgl/util/ptr.hpp> #include <mbgl/text/placement_config.hpp> #include <mbgl/geometry/feature_index.hpp> +#include <atomic> #include <string> #include <memory> #include <mutex> @@ -49,7 +49,7 @@ public: SpriteStore&, GlyphAtlas&, GlyphStore&, - const util::Atomic<bool>&, + const std::atomic<bool>&, const MapMode); ~TileWorker(); @@ -73,7 +73,7 @@ private: SpriteStore& spriteStore; GlyphAtlas& glyphAtlas; GlyphStore& glyphStore; - const util::Atomic<bool>& obsolete; + const std::atomic<bool>& obsolete; const MapMode mode; bool partialParse = false; |