From eaa9444201aa72535514ea1c538b351892032e9e Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 30 Oct 2023 09:48:02 -0700 Subject: [PATCH 1/2] [PATCH] Include cstdint for uint16_t (c62e03344fe3af8d061f3ff881ab3cb7bfa0e1e9) --- include/mapnik/wkb.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/mapnik/wkb.hpp b/include/mapnik/wkb.hpp index fc32a9fff..a9d5deb99 100644 --- a/include/mapnik/wkb.hpp +++ b/include/mapnik/wkb.hpp @@ -28,6 +28,9 @@ #include #include +// stl +#include + namespace mapnik { From a3b6d4a50b1a3253b1cc840cdd14faf094d8bd42 Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Mon, 30 Oct 2023 09:49:06 -0700 Subject: [PATCH 2/2] [PATCH] Fix building with boost_1_80 (81103491b467e17218140f50bc0bb9dc8c1f0317) --- test/unit/serialization/wkb_test.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/unit/serialization/wkb_test.cpp b/test/unit/serialization/wkb_test.cpp index 8a617df26..26b019951 100644 --- a/test/unit/serialization/wkb_test.cpp +++ b/test/unit/serialization/wkb_test.cpp @@ -57,6 +57,23 @@ struct spatially_equal_visitor return true; } + result_type operator()(mapnik::geometry::multi_line_string const& lhs, + mapnik::geometry::multi_line_string const& rhs) const + { + + std::size_t size0 = lhs.size(); + std::size_t size1 = rhs.size(); + if (size0 != size1) + return false; + + for (std::size_t index = 0; index < size0; ++index) + { + if (!boost::geometry::equals(lhs[index], rhs[index])) + return false; + } + return true; + } + template result_type operator() (T const& lhs, T const& rhs) const {