diff options
author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2020-02-27 11:46:17 +0200 |
---|---|---|
committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2020-03-05 17:43:37 +0200 |
commit | 81e116d41a4ea1e3ed0d5e91e06541c3e8855a09 (patch) | |
tree | 79cdee7e5a4ffda6fafcb9f4fce39b5b87682385 /test/tile/geojson_tile.test.cpp | |
parent | c5155dcf334a5c5125c065e4447cb8b30989e5e5 (diff) | |
download | qtlocation-mapboxgl-81e116d41a4ea1e3ed0d5e91e06541c3e8855a09.tar.gz |
[core] Use weak annotation manager
Map and renderer / orchestrator should be able to run on a separate threads,
however, legacy AnnotationManager is shared between Map and Renderer, therefore
is not a thread safe. Until AnnotationManager is deprecated and removed from a
code-base, use it only via weak pointers.
Diffstat (limited to 'test/tile/geojson_tile.test.cpp')
-rw-r--r-- | test/tile/geojson_tile.test.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/test/tile/geojson_tile.test.cpp b/test/tile/geojson_tile.test.cpp index 25fd268dc8..bffd99999e 100644 --- a/test/tile/geojson_tile.test.cpp +++ b/test/tile/geojson_tile.test.cpp @@ -31,17 +31,15 @@ public: GlyphManager glyphManager; Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" }; - TileParameters tileParameters { - 1.0, - MapDebugOptions(), - transformState, - fileSource, - MapMode::Continuous, - annotationManager, - imageManager, - glyphManager, - 0 - }; + TileParameters tileParameters{1.0, + MapDebugOptions(), + transformState, + fileSource, + MapMode::Continuous, + annotationManager.makeWeakPtr(), + imageManager, + glyphManager, + 0}; }; namespace { |