Subject: [Boost-commit] svn:boost r78616 - in trunk/boost/geometry: algorithms/detail/overlay multi/algorithms/detail/overlay multi/algorithms/detail/sections
From: barend.gehrels_at_[hidden]
Date: 2012-05-25 10:38:57
Author: barendgehrels
Date: 2012-05-25 10:38:55 EDT (Fri, 25 May 2012)
New Revision: 78616
URL: http://svn.boost.org/trac/boost/changeset/78616
Log:
Update w.r.t. Boost.Range size now unsigned - remove warnings
Text files modified:
trunk/boost/geometry/algorithms/detail/overlay/copy_segments.hpp | 4 ++--
trunk/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp | 2 +-
trunk/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp | 2 +-
trunk/boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp | 2 +-
trunk/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
Modified: trunk/boost/geometry/algorithms/detail/overlay/copy_segments.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/detail/overlay/copy_segments.hpp (original)
+++ trunk/boost/geometry/algorithms/detail/overlay/copy_segments.hpp 2012-05-25 10:38:55 EDT (Fri, 25 May 2012)
@@ -89,7 +89,7 @@
typedef typename boost::range_difference<Ring>::type size_type;
size_type const count = from_index <= to_index
? to_index - from_index + 1
- : boost::size(view) - from_index + to_index + 1;
+ : int(boost::size(view)) - from_index + to_index + 1;
for (size_type i = 0; i < count; ++i, ++it)
{
@@ -117,7 +117,7 @@
int const from_index = seg_id.segment_index + 1;
// Sanity check
- if (from_index > to_index || from_index < 0 || to_index >= boost::size(ls))
+ if (from_index > to_index || from_index < 0 || to_index >= int(boost::size(ls)))
{
return;
}
Modified: trunk/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp
==============================================================================
--- trunk/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp (original)
+++ trunk/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp 2012-05-25 10:38:55 EDT (Fri, 25 May 2012)
@@ -42,7 +42,7 @@
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
Modified: trunk/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp
==============================================================================
--- trunk/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp (original)
+++ trunk/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp 2012-05-25 10:38:55 EDT (Fri, 25 May 2012)
@@ -44,7 +44,7 @@
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
Modified: trunk/boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp
==============================================================================
--- trunk/boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp (original)
+++ trunk/boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp 2012-05-25 10:38:55 EDT (Fri, 25 May 2012)
@@ -35,7 +35,7 @@
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]);
Modified: trunk/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp
==============================================================================
--- trunk/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp (original)
+++ trunk/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp 2012-05-25 10:38:55 EDT (Fri, 25 May 2012)
@@ -46,7 +46,7 @@
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);