diff options
Diffstat (limited to 'boost/geometry/algorithms/detail/relate/linear_linear.hpp')
-rw-r--r-- | boost/geometry/algorithms/detail/relate/linear_linear.hpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/boost/geometry/algorithms/detail/relate/linear_linear.hpp b/boost/geometry/algorithms/detail/relate/linear_linear.hpp index 20a22c3018..7a3f373e03 100644 --- a/boost/geometry/algorithms/detail/relate/linear_linear.hpp +++ b/boost/geometry/algorithms/detail/relate/linear_linear.hpp @@ -14,7 +14,12 @@ #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_LINEAR_LINEAR_HPP #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_LINEAR_LINEAR_HPP +#include <algorithm> + #include <boost/core/ignore_unused.hpp> +#include <boost/range/size.hpp> + +#include <boost/geometry/core/assert.hpp> #include <boost/geometry/util/condition.hpp> #include <boost/geometry/util/range.hpp> @@ -23,6 +28,7 @@ #include <boost/geometry/algorithms/detail/single_geometry.hpp> #include <boost/geometry/algorithms/detail/relate/point_geometry.hpp> +#include <boost/geometry/algorithms/detail/relate/result.hpp> #include <boost/geometry/algorithms/detail/relate/turns.hpp> #include <boost/geometry/algorithms/detail/relate/boundary_checker.hpp> #include <boost/geometry/algorithms/detail/relate/follow_helpers.hpp> @@ -576,7 +582,7 @@ struct linear_linear OtherBoundaryChecker const& /*other_boundary_checker*/) { boost::ignore_unused(first, last); - //BOOST_ASSERT( first != last ); + //BOOST_GEOMETRY_ASSERT( first != last ); // here, the possible exit is the real one // we know that we entered and now we exit @@ -586,7 +592,7 @@ struct linear_linear { update<interior, exterior, '1', transpose_result>(res); - BOOST_ASSERT(first != last); + BOOST_GEOMETRY_ASSERT(first != last); const TurnInfo * turn_ptr = NULL; if ( m_degenerated_turn_ptr ) @@ -598,7 +604,7 @@ struct linear_linear { segment_identifier const& prev_seg_id = turn_ptr->operations[op_id].seg_id; - //BOOST_ASSERT(!boost::empty(sub_range(geometry, prev_seg_id))); + //BOOST_GEOMETRY_ASSERT(!boost::empty(sub_range(geometry, prev_seg_id))); bool const prev_back_b = is_endpoint_on_boundary<boundary_back>( range::back(sub_range(geometry, prev_seg_id)), boundary_checker); @@ -688,7 +694,7 @@ struct linear_linear if ( first_in_range ) { - //BOOST_ASSERT(!boost::empty(ls1_ref)); + //BOOST_GEOMETRY_ASSERT(!boost::empty(ls1_ref)); bool const front_b = is_endpoint_on_boundary<boundary_front>( range::front(ls1_ref), boundary_checker); if ( front_b ) @@ -717,7 +723,7 @@ struct linear_linear if ( first_in_range ) { - //BOOST_ASSERT(!boost::empty(ls1_ref)); + //BOOST_GEOMETRY_ASSERT(!boost::empty(ls1_ref)); bool const front_b = is_endpoint_on_boundary<boundary_front>( range::front(ls1_ref), boundary_checker); if ( front_b ) |