Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r86338 - trunk/boost/geometry/algorithms
From: bruno.lalande_at_[hidden]
Date: 2013-10-17 02:21:28


Author: bruno.lalande
Date: 2013-10-17 02:21:28 EDT (Thu, 17 Oct 2013)
New Revision: 86338
URL: http://svn.boost.org/trac/boost/changeset/86338

Log:
Removed check_input stage - merged into resolve_variant.

Text files modified:
   trunk/boost/geometry/algorithms/centroid.hpp | 23 ++++-------------------
   1 files changed, 4 insertions(+), 19 deletions(-)

Modified: trunk/boost/geometry/algorithms/centroid.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/centroid.hpp Thu Oct 17 02:17:50 2013 (r86337)
+++ trunk/boost/geometry/algorithms/centroid.hpp 2013-10-17 02:21:28 EDT (Thu, 17 Oct 2013) (r86338)
@@ -347,7 +347,7 @@
 } // namespace resolve_strategy
 
 
-namespace check_input {
+namespace resolve_variant {
 
 template <typename Geometry>
 struct centroid
@@ -360,21 +360,6 @@
     }
 };
 
-} // namespace check_input
-
-
-namespace resolve_variant {
-
-template <typename Geometry>
-struct centroid
-{
- template <typename Point, typename Strategy>
- static inline void apply(Geometry const& geometry, Point& out, Strategy const& strategy)
- {
- check_input::centroid<Geometry>::apply(geometry, out, strategy);
- }
-};
-
 template <BOOST_VARIANT_ENUM_PARAMS(typename T)>
 struct centroid<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
 {
@@ -391,7 +376,7 @@
         template <typename Geometry>
         void operator()(Geometry const& geometry) const
         {
- return check_input::centroid<Geometry>::apply(geometry, m_out, m_strategy);
+ centroid<Geometry>::apply(geometry, m_out, m_strategy);
         }
     };
 
@@ -401,11 +386,11 @@
           Point& out,
           Strategy const& strategy)
     {
- return boost::apply_visitor(visitor<Point, Strategy>(out, strategy), geometry);
+ boost::apply_visitor(visitor<Point, Strategy>(out, strategy), geometry);
     }
 };
 
-};
+} // namespace resolve_variant
 
 
 /*!


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