From 91d461100c294e882d2682aed708b36bac0e8e87 Mon Sep 17 00:00:00 2001 From: Menelaos Karavelas Date: Fri, 16 May 2014 14:17:48 +0300 Subject: [PATCH 1/2] [test][length] do not test the variant-related code if GEOMETRY_TEST_DEBUG is defined (the variant-related code does not compile when GEOMETRY_TEST_DEBUG is defined) --- test/algorithms/test_length.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/algorithms/test_length.hpp b/test/algorithms/test_length.hpp index 713479d76..485c38056 100644 --- a/test/algorithms/test_length.hpp +++ b/test/algorithms/test_length.hpp @@ -44,7 +44,9 @@ void test_geometry(std::string const& wkt, double expected_length) Geometry geometry; bg::read_wkt(wkt, geometry); test_length(geometry, expected_length); +#if !defined(GEOMETRY_TEST_DEBUG) test_length(boost::variant(geometry), expected_length); +#endif } template From b992ddf185023bf78e3c4eac1cc5e91b832f7d10 Mon Sep 17 00:00:00 2001 From: Menelaos Karavelas Date: Fri, 16 May 2014 14:24:32 +0300 Subject: [PATCH 2/2] [test][perimeter] do not test the variant-related code if GEOMETRY_TEST_DEBUG is defined (the variant-related code does not compile when GEOMETRY_TEST_DEBUG is defined); replace bg::perimeter_result (non-existing) by bg::default_lentgh_result (error produced when compiling with -DGEOMETRY_TEST_DEBUG) --- test/algorithms/test_perimeter.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/algorithms/test_perimeter.hpp b/test/algorithms/test_perimeter.hpp index 7680e9860..74f04648a 100644 --- a/test/algorithms/test_perimeter.hpp +++ b/test/algorithms/test_perimeter.hpp @@ -29,7 +29,7 @@ void test_perimeter(Geometry const& geometry, long double expected_perimeter) std::ostringstream out; out << typeid(typename bg::coordinate_type::type).name() << std::endl - << typeid(typename bg::perimeter_result::type).name() + << typeid(typename bg::default_length_result::type).name() << std::endl << "perimeter : " << bg::perimeter(geometry) << std::endl; @@ -48,7 +48,9 @@ void test_geometry(std::string const& wkt, double expected_perimeter) boost::variant v(geometry); test_perimeter(geometry, expected_perimeter); +#if !defined(GEOMETRY_TEST_DEBUG) test_perimeter(v, expected_perimeter); +#endif } template