diff options
Diffstat (limited to 'boost/geometry/algorithms/detail/distance')
4 files changed, 22 insertions, 23 deletions
diff --git a/boost/geometry/algorithms/detail/distance/geometry_to_segment_or_box.hpp b/boost/geometry/algorithms/detail/distance/geometry_to_segment_or_box.hpp index 57257dbdcc..d6de7cac91 100644 --- a/boost/geometry/algorithms/detail/distance/geometry_to_segment_or_box.hpp +++ b/boost/geometry/algorithms/detail/distance/geometry_to_segment_or_box.hpp @@ -185,10 +185,10 @@ public: Geometry const > segment_iterator_type; - typedef typename std::vector + typedef typename boost::range_const_iterator < - segment_or_box_point - >::const_iterator seg_or_box_iterator_type; + std::vector<segment_or_box_point> + >::type seg_or_box_const_iterator; typedef assign_new_min_iterator<SegmentOrBox> assign_new_value; @@ -219,8 +219,9 @@ public: // segment or box comparable_return_type cd_min1(0); point_iterator_type pit_min; - seg_or_box_iterator_type it_min1 = seg_or_box_points.begin(); - seg_or_box_iterator_type it_min2 = ++seg_or_box_points.begin(); + seg_or_box_const_iterator it_min1 = boost::const_begin(seg_or_box_points); + seg_or_box_const_iterator it_min2 = it_min1; + ++it_min2; bool first = true; for (point_iterator_type pit = points_begin(geometry); @@ -229,11 +230,11 @@ public: comparable_return_type cd; std::pair < - seg_or_box_iterator_type, seg_or_box_iterator_type + seg_or_box_const_iterator, seg_or_box_const_iterator > it_pair = point_to_point_range::apply(*pit, - seg_or_box_points.begin(), - seg_or_box_points.end(), + boost::const_begin(seg_or_box_points), + boost::const_end(seg_or_box_points), cstrategy, cd); @@ -250,12 +251,11 @@ public: // segments of the geometry comparable_return_type cd_min2(0); segment_iterator_type sit_min; - typename std::vector<segment_or_box_point>::const_iterator it_min; + seg_or_box_const_iterator it_min; first = true; - for (typename std::vector<segment_or_box_point>::const_iterator it - = seg_or_box_points.begin(); - it != seg_or_box_points.end(); ++it, first = false) + for (seg_or_box_const_iterator it = boost::const_begin(seg_or_box_points); + it != boost::const_end(seg_or_box_points); ++it, first = false) { comparable_return_type cd; segment_iterator_type sit diff --git a/boost/geometry/algorithms/detail/distance/interface.hpp b/boost/geometry/algorithms/detail/distance/interface.hpp index fa8cbd69ee..1e7cc433ef 100644 --- a/boost/geometry/algorithms/detail/distance/interface.hpp +++ b/boost/geometry/algorithms/detail/distance/interface.hpp @@ -198,7 +198,7 @@ struct distance<variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Geometry2> Geometry2 const& geometry2, Strategy const& strategy) { - return apply_visitor(visitor<Strategy>(geometry2, strategy), geometry1); + return boost::apply_visitor(visitor<Strategy>(geometry2, strategy), geometry1); } }; @@ -253,7 +253,7 @@ struct distance<Geometry1, variant<BOOST_VARIANT_ENUM_PARAMS(T)> > const variant<BOOST_VARIANT_ENUM_PARAMS(T)>& geometry2, Strategy const& strategy) { - return apply_visitor(visitor<Strategy>(geometry1, strategy), geometry2); + return boost::apply_visitor(visitor<Strategy>(geometry1, strategy), geometry2); } }; @@ -312,7 +312,7 @@ struct distance boost::variant<BOOST_VARIANT_ENUM_PARAMS(T2)> const& geometry2, Strategy const& strategy) { - return apply_visitor(visitor<Strategy>(strategy), geometry1, geometry2); + return boost::apply_visitor(visitor<Strategy>(strategy), geometry1, geometry2); } }; @@ -395,7 +395,7 @@ distance(Geometry1 const& geometry1, concept::check<Geometry1 const>(); concept::check<Geometry2 const>(); - return distance(geometry1, geometry2, default_strategy()); + return geometry::distance(geometry1, geometry2, default_strategy()); } }} // namespace boost::geometry diff --git a/boost/geometry/algorithms/detail/distance/range_to_geometry_rtree.hpp b/boost/geometry/algorithms/detail/distance/range_to_geometry_rtree.hpp index 78189794a1..6e78bee694 100644 --- a/boost/geometry/algorithms/detail/distance/range_to_geometry_rtree.hpp +++ b/boost/geometry/algorithms/detail/distance/range_to_geometry_rtree.hpp @@ -13,8 +13,7 @@ #include <iterator> #include <utility> -#include <boost/assert.hpp> - +#include <boost/geometry/core/assert.hpp> #include <boost/geometry/core/point_type.hpp> #include <boost/geometry/iterators/has_one_element.hpp> @@ -70,7 +69,7 @@ public: { namespace sds = strategy::distance::services; - BOOST_ASSERT( first != last ); + BOOST_GEOMETRY_ASSERT( first != last ); if ( geometry::has_one_element(first, last) ) { diff --git a/boost/geometry/algorithms/detail/distance/segment_to_box.hpp b/boost/geometry/algorithms/detail/distance/segment_to_box.hpp index 79d9adb703..783699ee0a 100644 --- a/boost/geometry/algorithms/detail/distance/segment_to_box.hpp +++ b/boost/geometry/algorithms/detail/distance/segment_to_box.hpp @@ -15,13 +15,13 @@ #include <functional> #include <vector> -#include <boost/assert.hpp> #include <boost/core/ignore_unused.hpp> #include <boost/mpl/if.hpp> #include <boost/numeric/conversion/cast.hpp> #include <boost/type_traits/is_same.hpp> #include <boost/geometry/core/access.hpp> +#include <boost/geometry/core/assert.hpp> #include <boost/geometry/core/closure.hpp> #include <boost/geometry/core/coordinate_dimension.hpp> #include <boost/geometry/core/point_type.hpp> @@ -561,7 +561,7 @@ private: typedef compare_less_equal<ReturnType, true> less_equal; // assert that the segment has non-negative slope - BOOST_ASSERT( ( math::equals(geometry::get<0>(p0), geometry::get<0>(p1)) + BOOST_GEOMETRY_ASSERT( ( math::equals(geometry::get<0>(p0), geometry::get<0>(p1)) && geometry::get<1>(p0) < geometry::get<1>(p1)) || ( geometry::get<0>(p0) < geometry::get<0>(p1) @@ -617,7 +617,7 @@ private: typedef compare_less_equal<ReturnType, false> greater_equal; // assert that the segment has negative slope - BOOST_ASSERT( geometry::get<0>(p0) < geometry::get<0>(p1) + BOOST_GEOMETRY_ASSERT( geometry::get<0>(p0) < geometry::get<0>(p1) && geometry::get<1>(p0) > geometry::get<1>(p1) ); ReturnType result(0); @@ -665,7 +665,7 @@ public: PPStrategy const& pp_strategy, PSStrategy const& ps_strategy) { - BOOST_ASSERT( geometry::less<SegmentPoint>()(p0, p1) ); + BOOST_GEOMETRY_ASSERT( geometry::less<SegmentPoint>()(p0, p1) ); if (geometry::get<0>(p0) < geometry::get<0>(p1) && geometry::get<1>(p0) > geometry::get<1>(p1)) |