boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-11 11:52:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:boostorg/geometry into develop

Browse Source
This commit is contained in:
Adam Wulkiewicz
2014-05-19 01:12:55 +02:00
parent ba8d1b471d 6d8a31951b
commit ea0d08fb67
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/algorithms/test_length.hpp
View File

@@ -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>(geometry), expected_length);
#endif
}
template <typename Geometry>

4
test/algorithms/test_perimeter.hpp
View File

@@ -29,7 +29,7 @@ void test_perimeter(Geometry const& geometry, long double expected_perimeter)
std::ostringstream out;
out << typeid(typename bg::coordinate_type<Geometry>::type).name()
<< std::endl
<< typeid(typename bg::perimeter_result<Geometry>::type).name()
<< typeid(typename bg::default_length_result<Geometry>::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<Geometry> v(geometry);
test_perimeter(geometry, expected_perimeter);
#if !defined(GEOMETRY_TEST_DEBUG)
test_perimeter(v, expected_perimeter);
#endif
}
template <typename Geometry>