[Boost-commit] svn:boost r78673 - trunk/boost/geometry/multi/algorithms/detail

Subject: [Boost-commit] svn:boost r78673 - trunk/boost/geometry/multi/algorithms/detail
From: barend.gehrels_at_[hidden]
Date: 2012-05-27 07:22:16

Author: barendgehrels
Date: 2012-05-27 07:22:15 EDT (Sun, 27 May 2012)
New Revision: 78673
URL: http://svn.boost.org/trac/boost/changeset/78673

Log:
[geometry] Fixes for point_on_border multi-version
Text files modified: 
   trunk/boost/geometry/multi/algorithms/detail/point_on_border.hpp |    16 ++++++++--------                        
   1 files changed, 8 insertions(+), 8 deletions(-)

Modified: trunk/boost/geometry/multi/algorithms/detail/point_on_border.hpp
==============================================================================
--- trunk/boost/geometry/multi/algorithms/detail/point_on_border.hpp	(original)
+++ trunk/boost/geometry/multi/algorithms/detail/point_on_border.hpp	2012-05-27 07:22:15 EDT (Sun, 27 May 2012)
@@ -31,13 +31,13 @@
 
 template
 <
-    typename MultiGeometry,
     typename Point,
+    typename MultiGeometry,
     typename Policy
 >
 struct point_on_multi
 {
-    static inline bool apply(MultiGeometry const& multi, Point& point)
+    static inline bool apply(Point& point, MultiGeometry const& multi, bool midpoint)
     {
         // Take a point on the first multi-geometry
         // (i.e. the first that is not empty)
@@ -48,7 +48,7 @@
             it != boost::end(multi);
             ++it)
         {
-            if (Policy::apply(*it, point))
+            if (Policy::apply(point, *it, midpoint))
             {
                 return true;
             }
@@ -69,16 +69,16 @@
 {
 
 
-template<typename Multi, typename Point>
-struct point_on_border<multi_polygon_tag, Multi, Point>
+template<typename Point, typename Multi>
+struct point_on_border<multi_polygon_tag, Point, Multi>
     : detail::point_on_border::point_on_multi
         <
-            Multi,
             Point,
+            Multi,
             detail::point_on_border::point_on_polygon
                 <
-                    typename boost::range_value<Multi>::type,
-                    Point
+                    Point,
+                    typename boost::range_value<Multi>::type
                 >
         >
 {};