diff options
| author | Brad Leege <bleege@gmail.com> | 2016-06-09 14:00:49 -0500 |
|---|---|---|
| committer | Brad Leege <bleege@gmail.com> | 2016-06-09 14:00:49 -0500 |
| commit | d67b88dba94a5e50eabaa8c133bb66fc3da8ee6f (patch) | |
| tree | 29a5bef10a72aff72efdf7d92b0ab30fdf94684e /src/mbgl/tile/vector_tile_data.hpp | |
| parent | c3cbe67c018a2431140babf2b8ba4c403e5e429f (diff) | |
| parent | c9d78f3f62fe02314bcc2d2a9dcef8d323b6e161 (diff) | |
| download | qtlocation-mapboxgl-d67b88dba94a5e50eabaa8c133bb66fc3da8ee6f.tar.gz | |
Merge branch 'release-android-v4.1.0'
# Conflicts:
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
# platform/android/src/jni.cpp
# src/mbgl/geometry/buffer.hpp
# src/mbgl/geometry/glyph_atlas.cpp
# src/mbgl/geometry/glyph_atlas.hpp
# src/mbgl/geometry/line_atlas.cpp
# src/mbgl/geometry/vao.cpp
# src/mbgl/gl/gl_object_store.cpp
# src/mbgl/gl/gl_object_store.hpp
# src/mbgl/renderer/frame_history.cpp
# src/mbgl/shader/shader.cpp
# src/mbgl/sprite/sprite_atlas.cpp
# src/mbgl/sprite/sprite_atlas.hpp
# src/mbgl/text/glyph_pbf.hpp
Diffstat (limited to 'src/mbgl/tile/vector_tile_data.hpp')
| -rw-r--r-- | src/mbgl/tile/vector_tile_data.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/tile/vector_tile_data.hpp b/src/mbgl/tile/vector_tile_data.hpp index e7de39e038..df2a23fda6 100644 --- a/src/mbgl/tile/vector_tile_data.hpp +++ b/src/mbgl/tile/vector_tile_data.hpp @@ -3,9 +3,9 @@ #include <mbgl/tile/tile_data.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> @@ -69,7 +69,7 @@ private: PlacementConfig targetConfig; // Used to signal the worker that it should abandon parsing this tile as soon as possible. - std::atomic<bool> obsolete { false }; + util::Atomic<bool> obsolete { false }; }; } // namespace mbgl |