import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / geometry / algorithms / detail / sections / section_functions.hpp

diff --git a/ceph/src/boost/boost/geometry/algorithms/detail/sections/section_functions.hpp b/ceph/src/boost/boost/geometry/algorithms/detail/sections/section_functions.hpp
index bd72ff48a02f4008845ba201bab8346deda1b9db..44fb4665b9d156c7b20cf04e2c8f92a8726c8845 100644 (file)
--- a/ceph/src/boost/boost/geometry/algorithms/detail/sections/section_functions.hpp
+++ b/ceph/src/boost/boost/geometry/algorithms/detail/sections/section_functions.hpp
@@ -14,8 +14,8 @@
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_SECTIONS_FUNCTIONS_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_SECTIONS_FUNCTIONS_HPP
 
-
 #include <boost/geometry/core/access.hpp>
+#include <boost/geometry/core/coordinate_type.hpp>
 #include <boost/geometry/algorithms/detail/recalculate.hpp>
 #include <boost/geometry/policies/robustness/robust_point_type.hpp>
 
@@ -122,34 +122,38 @@ template
 <
     std::size_t Dimension,
     typename Point,
-    typename RobustBox,
+    typename Box,
     typename RobustPolicy
 >
 static inline bool preceding(int dir,
                              Point const& point,
-                             RobustBox const& point_robust_box,
-                             RobustBox const& other_robust_box,
+                             Box const& point_box,
+                             Box const& other_box,
                              RobustPolicy const& robust_policy)
 {
     typename geometry::robust_point_type<Point, RobustPolicy>::type robust_point;
+    assert_coordinate_type_equal(robust_point, point_box);
     geometry::recalculate(robust_point, point, robust_policy);
-    return preceding_check<Dimension, Point>::apply(dir, robust_point, point_robust_box, other_robust_box);
+
+    return preceding_check<Dimension, Box>::apply(dir, robust_point,
+                                                    point_box,
+                                                    other_box);
 }
 
 template
 <
     std::size_t Dimension,
     typename Point,
-    typename RobustBox,
+    typename Box,
     typename RobustPolicy
 >
 static inline bool exceeding(int dir,
                              Point const& point,
-                             RobustBox const& point_robust_box,
-                             RobustBox const& other_robust_box,
+                             Box const& point_box,
+                             Box const& other_box,
                              RobustPolicy const& robust_policy)
 {
-    return preceding<Dimension>(-dir, point, point_robust_box, other_robust_box, robust_policy);
+    return preceding<Dimension>(-dir, point, point_box, other_box, robust_policy);
 }