From d8ac1f8946eff0ad5dd6a959a469e9d3409fa48e Mon Sep 17 00:00:00 2001 From: Alexander Shalamov Date: Wed, 12 Feb 2020 17:23:02 +0200 Subject: [core] Use atomic int in Map.PrefetchDelta* unit tests --- test/map/map.test.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/map/map.test.cpp b/test/map/map.test.cpp index 54dbccdafc..e00f84eff0 100644 --- a/test/map/map.test.cpp +++ b/test/map/map.test.cpp @@ -30,6 +30,8 @@ #include #include +#include + using namespace mbgl; using namespace mbgl::style; using namespace std::literals::string_literals; @@ -1148,7 +1150,7 @@ TEST(Map, PrefetchDeltaOverride) { vectorSource->setPrefetchZoomDelta(0); test.map.getStyle().addSource(std::move(vectorSource)); - unsigned requestedTiles = 0u; + std::atomic_int requestedTiles(0); test.fileSource->tileResponse = [&](const Resource&) { ++requestedTiles; Response res; @@ -1176,7 +1178,7 @@ TEST(Map, PrefetchDeltaOverride) { // 2 sources x 4 tiles EXPECT_EQ(8, requestedTiles); - requestedTiles = 0u; + requestedTiles = 0; // Should request z12 tiles when delta is set back to default, that is 4. test.observer.didFinishRenderingFrameCallback = [&](MapObserver::RenderFrameStatus status) { @@ -1210,7 +1212,7 @@ TEST(Map, PrefetchDeltaOverrideCustomSource) { }] })STYLE"); - unsigned requestedTiles = 0u; + std::atomic_int requestedTiles(0); auto makeCustomSource = [&requestedTiles, &test] { CustomGeometrySource::Options options; @@ -1233,7 +1235,7 @@ TEST(Map, PrefetchDeltaOverrideCustomSource) { test.observer.didFinishLoadingMapCallback = [&] { test.runLoop.stop(); }; test.runLoop.run(); EXPECT_EQ(4, requestedTiles); - requestedTiles = 0u; + requestedTiles = 0; test.observer.didFinishRenderingFrameCallback = [&](MapObserver::RenderFrameStatus status) { if (status.mode == MapObserver::RenderMode::Full) { -- cgit v1.2.1