|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r80680 - in trunk/boost/geometry: algorithms multi/algorithms
From: bruno.lalande_at_[hidden]
Date: 2012-09-23 17:20:26
Author: bruno.lalande
Date: 2012-09-23 17:20:25 EDT (Sun, 23 Sep 2012)
New Revision: 80680
URL: http://svn.boost.org/trac/boost/changeset/80680
Log:
Removed now unused Point template parameter from dispatch::centroid.
Text files modified:
trunk/boost/geometry/algorithms/centroid.hpp | 34 ++++++++++++----------------------
trunk/boost/geometry/multi/algorithms/centroid.hpp | 24 ++++++------------------
2 files changed, 18 insertions(+), 40 deletions(-)
Modified: trunk/boost/geometry/algorithms/centroid.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/centroid.hpp (original)
+++ trunk/boost/geometry/algorithms/centroid.hpp 2012-09-23 17:20:25 EDT (Sun, 23 Sep 2012)
@@ -266,41 +266,32 @@
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 @@
dispatch::centroid
<
typename tag<Geometry>::type,
- Geometry,
- Point
+ Geometry
>::apply(geometry, c, strategy);
}
Modified: trunk/boost/geometry/multi/algorithms/centroid.hpp
==============================================================================
--- trunk/boost/geometry/multi/algorithms/centroid.hpp (original)
+++ trunk/boost/geometry/multi/algorithms/centroid.hpp 2012-09-23 17:20:25 EDT (Sun, 23 Sep 2012)
@@ -95,24 +95,16 @@
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 @@
{};
-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
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk