[Boost-commit] svn:boost r76417 - trunk/boost/geometry/algorithms

Subject: [Boost-commit] svn:boost r76417 - trunk/boost/geometry/algorithms
From: bruno.lalande_at_[hidden]
Date: 2012-01-11 17:35:03

Author: bruno.lalande
Date: 2012-01-11 17:35:02 EST (Wed, 11 Jan 2012)
New Revision: 76417
URL: http://svn.boost.org/trac/boost/changeset/76417

Log:
Moved OutputGeometry in dispatch::convex_hull from class level to function level. Renamed some template parameters to better reflect their roles.
Text files modified: 
   trunk/boost/geometry/algorithms/convex_hull.hpp |    22 ++++++++++------------                  
   1 files changed, 10 insertions(+), 12 deletions(-)

Modified: trunk/boost/geometry/algorithms/convex_hull.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/convex_hull.hpp	(original)
+++ trunk/boost/geometry/algorithms/convex_hull.hpp	2012-01-11 17:35:02 EST (Wed, 11 Jan 2012)
@@ -63,11 +63,11 @@
 template
 <
     typename Geometry,
-    typename OutputGeometry,
     typename Strategy
 >
 struct hull_to_geometry
 {
+    template <typename OutputGeometry>
     static inline void apply(Geometry const& geometry, OutputGeometry& out,
             Strategy const& strategy)
     {
@@ -110,21 +110,20 @@
 template
 <
     typename Geometry,
-    typename Output,
     typename Strategy = typename detail::convex_hull::default_strategy<Geometry>::type
 >
 struct convex_hull
-    : detail::convex_hull::hull_to_geometry<Geometry, Output, Strategy>
+    : detail::convex_hull::hull_to_geometry<Geometry, Strategy>
 {};
 
 
 template
 <
     order_selector Order,
-    typename GeometryIn, typename Strategy
+    typename Geometry, typename Strategy
 >
 struct convex_hull_insert
-    : detail::convex_hull::hull_insert<GeometryIn, Order, Strategy>
+    : detail::convex_hull::hull_insert<Geometry, Order, Strategy>
 {};
 
 
@@ -132,14 +131,14 @@
 #endif // DOXYGEN_NO_DISPATCH
 
 
-template<typename Geometry1, typename Geometry2, typename Strategy>
-inline void convex_hull(Geometry1 const& geometry,
-            Geometry2& out, Strategy const& strategy)
+template<typename Geometry, typename OutputGeometry, typename Strategy>
+inline void convex_hull(Geometry const& geometry,
+            OutputGeometry& out, Strategy const& strategy)
 {
     concept::check_concepts_and_equal_dimensions
         <
-            const Geometry1,
-            Geometry2
+            const Geometry,
+            OutputGeometry
         >();
 
     BOOST_CONCEPT_ASSERT( (geometry::concept::ConvexHullStrategy<Strategy>) );
@@ -147,8 +146,7 @@
 
     dispatch::convex_hull
         <
-            Geometry1,
-            Geometry2,
+            Geometry,
             Strategy
         >::apply(geometry, out, strategy);
 }