diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-07-11 19:19:04 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-07-12 20:42:29 +0300 |
commit | 4014aa6721e53318e4ac92814776b3e01b4589cb (patch) | |
tree | dd57dfb64f5db1a9afaf7ab94cfa9aaeaae1392b /test/tile | |
parent | 2fae373fc9da1a5ed61b5114d8c982073734826d (diff) | |
download | qtlocation-mapboxgl-4014aa6721e53318e4ac92814776b3e01b4589cb.tar.gz |
[core] GCC 4.9 bracket initialization issues
Diffstat (limited to 'test/tile')
-rw-r--r-- | test/tile/annotation_tile.test.cpp | 6 | ||||
-rw-r--r-- | test/tile/vector_tile.test.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/tile/annotation_tile.test.cpp b/test/tile/annotation_tile.test.cpp index a1bfc23492..813b813220 100644 --- a/test/tile/annotation_tile.test.cpp +++ b/test/tile/annotation_tile.test.cpp @@ -58,7 +58,7 @@ TEST(AnnotationTile, Issue8289) { // Simulate layout and placement of a symbol layer. tile.onLayout(GeometryTile::LayoutResult { - {}, + std::unordered_map<std::string, std::shared_ptr<Bucket>>(), std::make_unique<FeatureIndex>(), std::move(data), 0 @@ -72,7 +72,7 @@ TEST(AnnotationTile, Issue8289) { collisionTile->placeFeature(feature, false, false); tile.onPlacement(GeometryTile::PlacementResult { - {}, + std::unordered_map<std::string, std::shared_ptr<Bucket>>(), std::move(collisionTile), {}, {}, @@ -81,7 +81,7 @@ TEST(AnnotationTile, Issue8289) { // Simulate a second layout with empty data. tile.onLayout(GeometryTile::LayoutResult { - {}, + std::unordered_map<std::string, std::shared_ptr<Bucket>>(), std::make_unique<FeatureIndex>(), std::make_unique<AnnotationTileData>(), 0 diff --git a/test/tile/vector_tile.test.cpp b/test/tile/vector_tile.test.cpp index 18152cd2c1..d7ad3c999d 100644 --- a/test/tile/vector_tile.test.cpp +++ b/test/tile/vector_tile.test.cpp @@ -89,7 +89,7 @@ TEST(VectorTile, Issue7615) { // Subsequent onLayout should not cause the existing symbol bucket to be discarded. tile.onLayout(GeometryTile::LayoutResult { - {}, + std::unordered_map<std::string, std::shared_ptr<Bucket>>(), nullptr, nullptr, 0 |