Removed now unused Point template parameter from dispatch::centroid.

[SVN r80680]
This commit is contained in:
Bruno Lalande
2012-09-23 21:20:25 +00:00
parent fe2edf15f8
commit 6dd794a09d
2 changed files with 18 additions and 40 deletions

View File

@@ -266,41 +266,32 @@ namespace dispatch
template
<
typename Tag,
typename Geometry,
typename Point
typename Geometry
>
struct centroid {};
template
<
typename Geometry,
typename Point
>
struct centroid<point_tag, Geometry, Point>
template <typename Geometry>
struct centroid<point_tag, Geometry>
: detail::centroid::centroid_point
{};
template
<
typename Box,
typename Point
>
struct centroid<box_tag, Box, Point>
template <typename Box>
struct centroid<box_tag, Box>
: detail::centroid::centroid_box
{};
template <typename Ring, typename Point>
struct centroid<ring_tag, Ring, Point>
template <typename Ring>
struct centroid<ring_tag, Ring>
: detail::centroid::centroid_range<geometry::closure<Ring>::value>
{};
template <typename Linestring, typename Point>
struct centroid<linestring_tag, Linestring, Point>
template <typename Linestring>
struct centroid<linestring_tag, Linestring>
: detail::centroid::centroid_range<closed>
{};
template <typename Polygon, typename Point>
struct centroid<polygon_tag, Polygon, Point>
template <typename Polygon>
struct centroid<polygon_tag, Polygon>
: detail::centroid::centroid_polygon
{};
@@ -340,8 +331,7 @@ inline void centroid(Geometry const& geometry, Point& c,
dispatch::centroid
<
typename tag<Geometry>::type,
Geometry,
Point
Geometry
>::apply(geometry, c, strategy);
}

View File

@@ -95,24 +95,16 @@ struct centroid_multi
namespace dispatch
{
template
<
typename MultiLinestring,
typename Point
>
struct centroid<multi_linestring_tag, MultiLinestring, Point>
template <typename MultiLinestring>
struct centroid<multi_linestring_tag, MultiLinestring>
: detail::centroid::centroid_multi
<
detail::centroid::centroid_range_state<closed>
>
{};
template
<
typename MultiPolygon,
typename Point
>
struct centroid<multi_polygon_tag, MultiPolygon, Point>
template <typename MultiPolygon>
struct centroid<multi_polygon_tag, MultiPolygon>
: detail::centroid::centroid_multi
<
detail::centroid::centroid_polygon_state
@@ -120,12 +112,8 @@ struct centroid<multi_polygon_tag, MultiPolygon, Point>
{};
template
<
typename MultiPoint,
typename Point
>
struct centroid<multi_point_tag, MultiPoint, Point>
template <typename MultiPoint>
struct centroid<multi_point_tag, MultiPoint>
: detail::centroid::centroid_multi
<
detail::centroid::centroid_multi_point_state