Bas Couwenberg pushed to branch master at Debian GIS Project / mapbox-geometry
Commits: 8f9ffda5 by Bas Couwenberg at 2018-07-20T20:02:22+02:00 New upstream version 0.9.3 - - - - - 4583fe52 by Bas Couwenberg at 2018-07-20T20:02:29+02:00 Merge tag 'upstream/0.9.3' Upstream version 0.9.3 - - - - - 325c4c2d by Bas Couwenberg at 2018-07-20T20:02:52+02:00 New upstream release. - - - - - 3ba2af46 by Bas Couwenberg at 2018-07-20T20:03:30+02:00 Set distribution to unstable. - - - - - 8 changed files: - debian/changelog - include/mapbox/geometry/feature.hpp - include/mapbox/geometry/geometry.hpp - include/mapbox/geometry/line_string.hpp - include/mapbox/geometry/multi_line_string.hpp - include/mapbox/geometry/multi_point.hpp - include/mapbox/geometry/multi_polygon.hpp - include/mapbox/geometry/polygon.hpp Changes: ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mapbox-geometry (0.9.3-1) unstable; urgency=medium + + * New upstream release. + + -- Bas Couwenberg <[email protected]> Fri, 20 Jul 2018 20:03:21 +0200 + mapbox-geometry (0.9.2-2) unstable; urgency=medium * Update copyright-format URL to use HTTPS. ===================================== include/mapbox/geometry/feature.hpp ===================================== --- a/include/mapbox/geometry/feature.hpp +++ b/include/mapbox/geometry/feature.hpp @@ -84,7 +84,12 @@ struct feature_collection : Cont<feature<T>> using coordinate_type = T; using feature_type = feature<T>; using container_type = Cont<feature_type>; - using container_type::container_type; + using size_type = typename container_type::size_type; + + template <class... Args> + feature_collection(Args&&... args) : container_type(std::forward<Args>(args)...) {} + feature_collection(std::initializer_list<feature_type> args) + : container_type(std::move(args)) {} }; } // namespace geometry ===================================== include/mapbox/geometry/geometry.hpp ===================================== --- a/include/mapbox/geometry/geometry.hpp +++ b/include/mapbox/geometry/geometry.hpp @@ -46,12 +46,12 @@ struct geometry_collection : Cont<geometry<T>> using coordinate_type = T; using geometry_type = geometry<T>; using container_type = Cont<geometry_type>; + using size_type = typename container_type::size_type; - geometry_collection() = default; - geometry_collection(geometry_collection const&) = default; - geometry_collection(geometry_collection &&) = default; - geometry_collection(std::initializer_list<geometry_type> && args) - : container_type(std::forward<std::initializer_list<geometry_type>>(args)) {}; + template <class... Args> + geometry_collection(Args&&... args) : container_type(std::forward<Args>(args)...) {} + geometry_collection(std::initializer_list<geometry_type> args) + : container_type(std::move(args)) {} }; } // namespace geometry ===================================== include/mapbox/geometry/line_string.hpp ===================================== --- a/include/mapbox/geometry/line_string.hpp +++ b/include/mapbox/geometry/line_string.hpp @@ -14,7 +14,12 @@ struct line_string : Cont<point<T> > using coordinate_type = T; using point_type = point<T>; using container_type = Cont<point_type>; - using container_type::container_type; + using size_type = typename container_type::size_type; + + template <class... Args> + line_string(Args&&... args) : container_type(std::forward<Args>(args)...) {} + line_string(std::initializer_list<point_type> args) + : container_type(std::move(args)) {} }; } // namespace geometry ===================================== include/mapbox/geometry/multi_line_string.hpp ===================================== --- a/include/mapbox/geometry/multi_line_string.hpp +++ b/include/mapbox/geometry/multi_line_string.hpp @@ -14,7 +14,12 @@ struct multi_line_string : Cont<line_string<T>> using coordinate_type = T; using line_string_type = line_string<T>; using container_type = Cont<line_string_type>; - using container_type::container_type; + using size_type = typename container_type::size_type; + + template <class... Args> + multi_line_string(Args&&... args) : container_type(std::forward<Args>(args)...) {} + multi_line_string(std::initializer_list<line_string_type> args) + : container_type(std::move(args)) {} }; } // namespace geometry ===================================== include/mapbox/geometry/multi_point.hpp ===================================== --- a/include/mapbox/geometry/multi_point.hpp +++ b/include/mapbox/geometry/multi_point.hpp @@ -14,7 +14,12 @@ struct multi_point : Cont<point<T>> using coordinate_type = T; using point_type = point<T>; using container_type = Cont<point_type>; - using container_type::container_type; + using size_type = typename container_type::size_type; + + template <class... Args> + multi_point(Args&&... args) : container_type(std::forward<Args>(args)...) {} + multi_point(std::initializer_list<point_type> args) + : container_type(std::move(args)) {} }; } // namespace geometry ===================================== include/mapbox/geometry/multi_polygon.hpp ===================================== --- a/include/mapbox/geometry/multi_polygon.hpp +++ b/include/mapbox/geometry/multi_polygon.hpp @@ -14,7 +14,12 @@ struct multi_polygon : Cont<polygon<T>> using coordinate_type = T; using polygon_type = polygon<T>; using container_type = Cont<polygon_type>; - using container_type::container_type; + using size_type = typename container_type::size_type; + + template <class... Args> + multi_polygon(Args&&... args) : container_type(std::forward<Args>(args)...) {} + multi_polygon(std::initializer_list<polygon_type> args) + : container_type(std::move(args)) {} }; } // namespace geometry ===================================== include/mapbox/geometry/polygon.hpp ===================================== --- a/include/mapbox/geometry/polygon.hpp +++ b/include/mapbox/geometry/polygon.hpp @@ -15,7 +15,12 @@ struct linear_ring : Cont<point<T>> using coordinate_type = T; using point_type = point<T>; using container_type = Cont<point_type>; - using container_type::container_type; + using size_type = typename container_type::size_type; + + template <class... Args> + linear_ring(Args&&... args) : container_type(std::forward<Args>(args)...) {} + linear_ring(std::initializer_list<point_type> args) + : container_type(std::move(args)) {} }; template <typename T, template <typename...> class Cont = std::vector> @@ -24,7 +29,12 @@ struct polygon : Cont<linear_ring<T>> using coordinate_type = T; using linear_ring_type = linear_ring<T>; using container_type = Cont<linear_ring_type>; - using container_type::container_type; + using size_type = typename container_type::size_type; + + template <class... Args> + polygon(Args&&... args) : container_type(std::forward<Args>(args)...) {} + polygon(std::initializer_list<linear_ring_type> args) + : container_type(std::move(args)) {} }; } // namespace geometry View it on GitLab: https://salsa.debian.org/debian-gis-team/mapbox-geometry/compare/f43ed0a928a9faa7f61c47eb37d3eda2a2796bec...3ba2af46a4abe4cfc0720e2d7d0f4bbf371f6a0c -- View it on GitLab: https://salsa.debian.org/debian-gis-team/mapbox-geometry/compare/f43ed0a928a9faa7f61c47eb37d3eda2a2796bec...3ba2af46a4abe4cfc0720e2d7d0f4bbf371f6a0c You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
