summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2017-07-11 19:15:10 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2017-07-12 20:42:29 +0300
commit2fae373fc9da1a5ed61b5114d8c982073734826d (patch)
tree105ce580cc7df0cf9cf0a9997c4702bc76b3faeb /test
parent21031b624ffabf92bf284c830b3d13a3ae045460 (diff)
downloadqtlocation-mapboxgl-2fae373fc9da1a5ed61b5114d8c982073734826d.tar.gz
[core] GCC 4.9 is unable to deduce ctors when using bracket init
Diffstat (limited to 'test')
-rw-r--r--test/algorithm/generate_clip_ids.test.cpp9
-rw-r--r--test/style/source.test.cpp3
-rw-r--r--test/tile/annotation_tile.test.cpp3
-rw-r--r--test/tile/geojson_tile.test.cpp3
-rw-r--r--test/tile/raster_tile.test.cpp3
-rw-r--r--test/tile/vector_tile.test.cpp3
6 files changed, 18 insertions, 6 deletions
diff --git a/test/algorithm/generate_clip_ids.test.cpp b/test/algorithm/generate_clip_ids.test.cpp
index 46a577b994..1ebdccb99e 100644
--- a/test/algorithm/generate_clip_ids.test.cpp
+++ b/test/algorithm/generate_clip_ids.test.cpp
@@ -7,7 +7,14 @@ using namespace mbgl;
struct Renderable {
UnwrappedTileID id;
ClipID clip;
- bool used = true;
+ bool used;
+
+ Renderable(UnwrappedTileID id_,
+ ClipID clip_,
+ bool used_ = true)
+ : id(std::move(id_)),
+ clip(std::move(clip_)),
+ used(used_) {}
bool operator==(const Renderable& rhs) const {
return id == rhs.id && clip == rhs.clip;
diff --git a/test/style/source.test.cpp b/test/style/source.test.cpp
index eaa3c72877..004ba18c5b 100644
--- a/test/style/source.test.cpp
+++ b/test/style/source.test.cpp
@@ -60,7 +60,8 @@ public:
MapMode::Continuous,
annotationManager,
imageManager,
- glyphManager
+ glyphManager,
+ 0
};
SourceTest() {
diff --git a/test/tile/annotation_tile.test.cpp b/test/tile/annotation_tile.test.cpp
index 6d00a3236a..a1bfc23492 100644
--- a/test/tile/annotation_tile.test.cpp
+++ b/test/tile/annotation_tile.test.cpp
@@ -43,7 +43,8 @@ public:
MapMode::Continuous,
annotationManager,
imageManager,
- glyphManager
+ glyphManager,
+ 0
};
};
diff --git a/test/tile/geojson_tile.test.cpp b/test/tile/geojson_tile.test.cpp
index 2aa85c3860..52f7a20f00 100644
--- a/test/tile/geojson_tile.test.cpp
+++ b/test/tile/geojson_tile.test.cpp
@@ -38,7 +38,8 @@ public:
MapMode::Continuous,
annotationManager,
imageManager,
- glyphManager
+ glyphManager,
+ 0
};
};
diff --git a/test/tile/raster_tile.test.cpp b/test/tile/raster_tile.test.cpp
index a0666c2146..025208c331 100644
--- a/test/tile/raster_tile.test.cpp
+++ b/test/tile/raster_tile.test.cpp
@@ -34,7 +34,8 @@ public:
MapMode::Continuous,
annotationManager,
imageManager,
- glyphManager
+ glyphManager,
+ 0
};
};
diff --git a/test/tile/vector_tile.test.cpp b/test/tile/vector_tile.test.cpp
index f24733dc9b..18152cd2c1 100644
--- a/test/tile/vector_tile.test.cpp
+++ b/test/tile/vector_tile.test.cpp
@@ -40,7 +40,8 @@ public:
MapMode::Continuous,
annotationManager,
imageManager,
- glyphManager
+ glyphManager,
+ 0
};
};