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

Subject: [Boost-commit] svn:boost r82467 - trunk/boost/geometry/algorithms
From: bruno.lalande_at_[hidden]
Date: 2013-01-12 15:56:01

Author: bruno.lalande
Date: 2013-01-12 15:56:00 EST (Sat, 12 Jan 2013)
New Revision: 82467
URL: http://svn.boost.org/trac/boost/changeset/82467

Log:
Removed a useless template parameter + used devariant_area in the no-strategy overload.
Text files modified: 
   trunk/boost/geometry/algorithms/area.hpp |    10 ++++++----                              
   1 files changed, 6 insertions(+), 4 deletions(-)

Modified: trunk/boost/geometry/algorithms/area.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/area.hpp	(original)
+++ trunk/boost/geometry/algorithms/area.hpp	2013-01-12 15:56:00 EST (Sat, 12 Jan 2013)
@@ -179,7 +179,8 @@
 struct devarianted_area
 {
     template <typename Strategy>
-    static inline typename Strategy::return_type apply(Geometry const& geometry, Strategy const& strategy)
+    static inline typename Strategy::return_type apply(Geometry const& geometry,
+                                                       Strategy const& strategy)
     {
         return area<Geometry>::apply(geometry, strategy);
     }
@@ -202,9 +203,10 @@
         }
     };
 
-    template <typename Geometry, typename Strategy>
+    template <typename Strategy>
     static inline typename Strategy::return_type
-    apply(Geometry const& geometry, Strategy const& strategy)
+    apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry,
+          Strategy const& strategy)
     {
         return boost::apply_visitor(visitor<Strategy>(strategy), geometry);
     }
@@ -251,7 +253,7 @@
 
     // detail::throw_on_empty_input(geometry);
         
-    return dispatch::area<Geometry>::apply(geometry, strategy_type());
+    return dispatch::devarianted_area<Geometry>::apply(geometry, strategy_type());
 }
 
 /*!