From 2a71903c75f1b0d6bc7ac1575600315b2353a626 Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Fri, 4 Nov 2022 14:07:28 +0000 Subject: [PATCH] Remove redundant BOOST_VERSION #if/endif --- test/unit/serialization/wkb_formats_test.cpp | 12 ++---------- test/unit/serialization/wkb_test.cpp | 6 ++---- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/test/unit/serialization/wkb_formats_test.cpp b/test/unit/serialization/wkb_formats_test.cpp index f7119d13d..473823fea 100644 --- a/test/unit/serialization/wkb_formats_test.cpp +++ b/test/unit/serialization/wkb_formats_test.cpp @@ -71,19 +71,14 @@ TEST_CASE("geometry formats") mapnik::wkbSpatiaLite); // winding order is not correct per OGC so we'll fix it mapnik::geometry::correct(geom); -#if BOOST_VERSION >= 105800 REQUIRE(mapnik::geometry::is_valid(geom)); REQUIRE(mapnik::geometry::is_simple(geom)); -#endif - geom = mapnik::geometry_utils::from_wkb((const char*)sp_valid_blob, sizeof(sp_valid_blob) / sizeof(sp_valid_blob[0]), mapnik::wkbAuto); mapnik::geometry::correct(geom); -#if BOOST_VERSION >= 105800 REQUIRE(mapnik::geometry::is_valid(geom)); REQUIRE(mapnik::geometry::is_simple(geom)); -#endif geom = mapnik::geometry_utils::from_wkb((const char*)sp_invalid_blob, sizeof(sp_invalid_blob) / sizeof(sp_invalid_blob[0]), @@ -95,26 +90,23 @@ TEST_CASE("geometry formats") geom = mapnik::geometry_utils::from_wkb((const char*)sq_valid_blob, sizeof(sq_valid_blob) / sizeof(sq_valid_blob[0]), mapnik::wkbGeneric); -#if BOOST_VERSION >= 105800 REQUIRE(mapnik::geometry::is_valid(geom)); REQUIRE(mapnik::geometry::is_simple(geom)); -#endif geom = mapnik::geometry_utils::from_wkb((const char*)sq_valid_blob, sizeof(sq_valid_blob) / sizeof(sq_valid_blob[0]), mapnik::wkbAuto); -#if BOOST_VERSION >= 105800 REQUIRE(mapnik::geometry::is_valid(geom)); REQUIRE(mapnik::geometry::is_simple(geom)); -#endif geom = mapnik::geometry_utils::from_wkb((const char*)sq_invalid_blob, sizeof(sq_invalid_blob) / sizeof(sq_invalid_blob[0]), mapnik::wkbGeneric); REQUIRE(geom.is()); // returns geometry_empty - } catch (std::exception const& ex) + } + catch (std::exception const& ex) { REQUIRE(false); std::clog << "threw: " << ex.what() << "\n"; diff --git a/test/unit/serialization/wkb_test.cpp b/test/unit/serialization/wkb_test.cpp index a176fb067..6073c0a93 100644 --- a/test/unit/serialization/wkb_test.cpp +++ b/test/unit/serialization/wkb_test.cpp @@ -16,7 +16,7 @@ #include #include -#if BOOST_VERSION >= 105800 + namespace { struct spatially_equal_visitor @@ -97,7 +97,7 @@ bool spatially_equal(mapnik::geometry::geometry const& g0, mapnik::geometry:: } } // namespace -#endif + TEST_CASE("Well-known-geometries") { @@ -131,9 +131,7 @@ TEST_CASE("Well-known-geometries") REQUIRE(wkt0 == wkt1); REQUIRE(wkt0 == wkt); // WKT round-trip // compare spatially (NOTE: GeometryCollection comparison also enforces strict order) -#if BOOST_VERSION >= 105800 REQUIRE(spatially_equal(geom_0, geom_1)); -#endif } // compare WKTS as ints