Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r80972 - in trunk/boost/geometry: algorithms multi/algorithms
From: bruno.lalande_at_[hidden]
Date: 2012-10-12 17:47:25


Author: bruno.lalande
Date: 2012-10-12 17:47:24 EDT (Fri, 12 Oct 2012)
New Revision: 80972
URL: http://svn.boost.org/trac/boost/changeset/80972

Log:
Defaulted Tag template parameter in dispatch::num_interior_rings.
Text files modified:
   trunk/boost/geometry/algorithms/num_interior_rings.hpp | 10 +++-------
   trunk/boost/geometry/multi/algorithms/num_interior_rings.hpp | 2 +-
   2 files changed, 4 insertions(+), 8 deletions(-)

Modified: trunk/boost/geometry/algorithms/num_interior_rings.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/num_interior_rings.hpp (original)
+++ trunk/boost/geometry/algorithms/num_interior_rings.hpp 2012-10-12 17:47:24 EDT (Fri, 12 Oct 2012)
@@ -32,7 +32,7 @@
 {
 
 
-template <typename Tag, typename Geometry>
+template <typename Geometry, typename Tag = typename tag<Geometry>::type>
 struct num_interior_rings
 {
     static inline std::size_t apply(Geometry const& )
@@ -44,7 +44,7 @@
 
 
 template <typename Polygon>
-struct num_interior_rings<polygon_tag, Polygon>
+struct num_interior_rings<Polygon, polygon_tag>
 {
     static inline std::size_t apply(Polygon const& polygon)
     {
@@ -74,11 +74,7 @@
 template <typename Geometry>
 inline std::size_t num_interior_rings(Geometry const& geometry)
 {
- return dispatch::num_interior_rings
- <
- typename tag<Geometry>::type,
- Geometry
- >::apply(geometry);
+ return dispatch::num_interior_rings<Geometry>::apply(geometry);
 }
 
 

Modified: trunk/boost/geometry/multi/algorithms/num_interior_rings.hpp
==============================================================================
--- trunk/boost/geometry/multi/algorithms/num_interior_rings.hpp (original)
+++ trunk/boost/geometry/multi/algorithms/num_interior_rings.hpp 2012-10-12 17:47:24 EDT (Fri, 12 Oct 2012)
@@ -34,7 +34,7 @@
 
 
 template <typename MultiPolygon>
-struct num_interior_rings<multi_polygon_tag, MultiPolygon>
+struct num_interior_rings<MultiPolygon, multi_polygon_tag>
 {
     static inline std::size_t apply(MultiPolygon const& multi_polygon)
     {


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