diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-07-11 19:15:10 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-07-12 20:42:29 +0300 |
| commit | 2fae373fc9da1a5ed61b5114d8c982073734826d (patch) | |
| tree | 105ce580cc7df0cf9cf0a9997c4702bc76b3faeb /include/mbgl/util | |
| parent | 21031b624ffabf92bf284c830b3d13a3ae045460 (diff) | |
| download | qtlocation-mapboxgl-2fae373fc9da1a5ed61b5114d8c982073734826d.tar.gz | |
[core] GCC 4.9 is unable to deduce ctors when using bracket init
Diffstat (limited to 'include/mbgl/util')
| -rw-r--r-- | include/mbgl/util/tileset.hpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/include/mbgl/util/tileset.hpp b/include/mbgl/util/tileset.hpp index 1256e9fe96..2fa19d3f53 100644 --- a/include/mbgl/util/tileset.hpp +++ b/include/mbgl/util/tileset.hpp @@ -13,9 +13,18 @@ public: enum class Scheme : bool { XYZ, TMS }; std::vector<std::string> tiles; - Range<uint8_t> zoomRange { 0, 22 }; + Range<uint8_t> zoomRange; std::string attribution; - Scheme scheme = Scheme::XYZ; + Scheme scheme; + + Tileset(std::vector<std::string> tiles_ = std::vector<std::string>(), + Range<uint8_t> zoomRange_ = { 0, 22 }, + std::string attribution_ = {}, + Scheme scheme_ = Scheme::XYZ) + : tiles(std::move(tiles_)), + zoomRange(std::move(zoomRange_)), + attribution(std::move(attribution_)), + scheme(scheme_) {} // TileJSON also includes center, zoom, and bounds, but they are not used by mbgl. |