From 4c1d03c257754ecc1555f3e31b3c6ccf45c4bf7b Mon Sep 17 00:00:00 2001 From: Ander Conselvan de Oliveira Date: Mon, 4 Nov 2019 08:12:23 +0200 Subject: [core] Fix MapSnapshotter build failure on Windows MSVC implementation of std::promise is buggy and only works with types that can be default-constructed. To avoid a compilation failure in the instantiation of ask() inside MapSnapshotter::getRegion(), which creates a std::promise, make LatLngBounds' default constructor public. --- include/mbgl/util/geo.hpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/mbgl/util/geo.hpp b/include/mbgl/util/geo.hpp index 170eca4f0a..9e1ecfff91 100644 --- a/include/mbgl/util/geo.hpp +++ b/include/mbgl/util/geo.hpp @@ -105,14 +105,12 @@ public: return bounds; } - /// Returns an infinite bound, a bound for which the constrain method returns its + /// Construct an infinite bound, a bound for which the constrain method returns its /// input unmodified. /// /// Note: this is different than LatLngBounds::world() since arbitrary unwrapped /// coordinates are also inside the bounds. - static LatLngBounds unbounded() { - return {}; - } + LatLngBounds() : sw({-90, -180}), ne({90, 180}), bounded(false) {} // Constructs a LatLngBounds object with the tile's exact boundaries. LatLngBounds(const CanonicalTileID&); @@ -172,9 +170,6 @@ private: LatLngBounds(LatLng sw_, LatLng ne_) : sw(sw_), ne(ne_) {} - LatLngBounds() - : sw({-90, -180}), ne({90, 180}), bounded(false) {} - bool containsLatitude(double latitude) const; bool containsLongitude(double longitude, LatLng::WrapMode wrap) const; -- cgit v1.2.1