diff options
Diffstat (limited to 'boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp')
-rw-r--r-- | boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp b/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp index 7bcc0b951e..b2c3836712 100644 --- a/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp +++ b/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp @@ -14,9 +14,9 @@ #include <algorithm> #include <iterator> -#include <boost/assert.hpp> #include <boost/range.hpp> +#include <boost/geometry/core/assert.hpp> #include <boost/geometry/core/tag.hpp> #include <boost/geometry/core/tags.hpp> @@ -142,7 +142,7 @@ static inline bool is_isolated_point(Turn const& turn, if ( turn.method == method_none ) { - BOOST_ASSERT( operation.operation == operation_continue ); + BOOST_GEOMETRY_ASSERT( operation.operation == operation_continue ); return true; } @@ -282,7 +282,7 @@ protected: false, false // do not reverse; do not remove spikes >::apply(linestring, current_segment_id, - static_cast<signed_index_type>(boost::size(linestring) - 1), + static_cast<signed_size_type>(boost::size(linestring) - 1), robust_policy, current_piece); } @@ -327,7 +327,7 @@ public: throw inconsistent_turns_exception(); } #else - BOOST_ASSERT(enter_count == 0); + BOOST_GEOMETRY_ASSERT(enter_count == 0); #endif return process_end(entered, linestring, @@ -404,7 +404,7 @@ protected: }; template <typename TurnIterator> - static inline signed_index_type get_multi_index(TurnIterator it) + static inline signed_size_type get_multi_index(TurnIterator it) { return boost::begin(it->operations)->seg_id.multi_index; } @@ -412,10 +412,10 @@ protected: class has_other_multi_id { private: - signed_index_type m_multi_id; + signed_size_type m_multi_id; public: - has_other_multi_id(signed_index_type multi_id) + has_other_multi_id(signed_size_type multi_id) : m_multi_id(multi_id) {} template <typename Turn> @@ -433,7 +433,7 @@ public: TurnIterator first, TurnIterator beyond, OutputIterator oit) { - BOOST_ASSERT( first != beyond ); + BOOST_GEOMETRY_ASSERT( first != beyond ); typedef copy_linestrings_in_range < @@ -446,7 +446,7 @@ public: // Iterate through all intersection points (they are // ordered along the each linestring) - signed_index_type current_multi_id = get_multi_index(first); + signed_size_type current_multi_id = get_multi_index(first); oit = copy_linestrings::apply(ls_first, ls_first + current_multi_id, @@ -463,7 +463,7 @@ public: oit = Base::apply(*(ls_first + current_multi_id), linear, per_ls_current, per_ls_next, oit); - signed_index_type next_multi_id(-1); + signed_size_type next_multi_id = -1; linestring_iterator ls_next = ls_beyond; if ( per_ls_next != beyond ) { |