diff options
Diffstat (limited to 'boost/geometry/multi/algorithms/detail')
5 files changed, 12 insertions, 12 deletions
diff --git a/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp b/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp index 1093a84569..72be5ddbf4 100644 --- a/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp +++ b/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp @@ -42,7 +42,7 @@ struct copy_segment_point_multi BOOST_ASSERT ( seg_id.multi_index >= 0 - && seg_id.multi_index < boost::size(multi) + && seg_id.multi_index < int(boost::size(multi)) ); // Call the single-version diff --git a/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp b/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp index a234e240da..f474b12fdf 100644 --- a/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp +++ b/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp @@ -44,7 +44,7 @@ struct copy_segments_multi BOOST_ASSERT ( seg_id.multi_index >= 0 - && seg_id.multi_index < boost::size(multi_geometry) + && seg_id.multi_index < int(boost::size(multi_geometry)) ); // Call the single-version diff --git a/boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp b/boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp index 8cdd7ed970..e23acf99b3 100644 --- a/boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp +++ b/boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp @@ -35,7 +35,7 @@ struct get_ring<multi_polygon_tag> BOOST_ASSERT ( id.multi_index >= 0 - && id.multi_index < boost::size(multi_polygon) + && id.multi_index < int(boost::size(multi_polygon)) ); return get_ring<polygon_tag>::apply(id, multi_polygon[id.multi_index]); diff --git a/boost/geometry/multi/algorithms/detail/point_on_border.hpp b/boost/geometry/multi/algorithms/detail/point_on_border.hpp index 04d76422c6..ac462ed4c5 100644 --- a/boost/geometry/multi/algorithms/detail/point_on_border.hpp +++ b/boost/geometry/multi/algorithms/detail/point_on_border.hpp @@ -31,13 +31,13 @@ namespace detail { namespace point_on_border 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 @@ struct point_on_multi it != boost::end(multi); ++it) { - if (Policy::apply(*it, point)) + if (Policy::apply(point, *it, midpoint)) { return true; } @@ -69,16 +69,16 @@ namespace dispatch { -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 > > {}; diff --git a/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp b/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp index cf4bf5d83b..28a4805ed1 100644 --- a/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp +++ b/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp @@ -46,7 +46,7 @@ struct full_section_multi BOOST_ASSERT ( section.ring_id.multi_index >= 0 - && section.ring_id.multi_index < boost::size(multi) + && section.ring_id.multi_index < int(boost::size(multi)) ); return Policy::apply(multi[section.ring_id.multi_index], section); |