[geometry] merge of Boost.Geometry into release branch

[SVN r84242]
This commit is contained in:
Barend Gehrels
2013-05-12 10:58:26 +00:00
parent ab7f6c110b
commit 485923d149
198 changed files with 9808 additions and 766 deletions

View File

@@ -19,11 +19,12 @@
#include <boost/geometry/multi/geometries/multi_linestring.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
#include <boost/variant/variant.hpp>
template <typename Geometry>
void test_geometry(std::string const& wkt, int expected)
void check_geometry(Geometry const& geometry, std::string const& wkt, int expected)
{
Geometry geometry;
bg::read_wkt(wkt, geometry);
int detected = bg::num_points(geometry);
BOOST_CHECK_MESSAGE(detected == expected,
"num_points: " << wkt
@@ -31,6 +32,15 @@ void test_geometry(std::string const& wkt, int expected)
<< " detected: " << detected);
}
template <typename Geometry>
void test_geometry(std::string const& wkt, int expected)
{
Geometry geometry;
bg::read_wkt(wkt, geometry);
check_geometry(geometry, wkt, expected);
check_geometry(boost::variant<Geometry>(geometry), wkt, expected);
}
template <typename Point>
void test_all()