Subject: [Boost-commit] svn:boost r78614 - in trunk/boost/geometry/algorithms: . detail detail/overlay detail/sections
From: barend.gehrels_at_[hidden]
Date: 2012-05-25 10:27:10
Author: barendgehrels
Date: 2012-05-25 10:27:09 EDT (Fri, 25 May 2012)
New Revision: 78614
URL: http://svn.boost.org/trac/boost/changeset/78614
Log:
Update w.r.t. Boost.Range size now unsigned
Text files modified:
trunk/boost/geometry/algorithms/area.hpp | 2 +-
trunk/boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp | 4 ++--
trunk/boost/geometry/algorithms/detail/overlay/copy_segments.hpp | 2 +-
trunk/boost/geometry/algorithms/detail/overlay/get_ring.hpp | 2 +-
trunk/boost/geometry/algorithms/detail/partition.hpp | 12 ++++++------
trunk/boost/geometry/algorithms/detail/sections/sectionalize.hpp | 2 +-
trunk/boost/geometry/algorithms/within.hpp | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
Modified: trunk/boost/geometry/algorithms/area.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/area.hpp (original)
+++ trunk/boost/geometry/algorithms/area.hpp 2012-05-25 10:27:09 EDT (Fri, 25 May 2012)
@@ -92,7 +92,7 @@
// An open ring has at least three points,
// A closed ring has at least four points,
// if not, there is no (zero) area
- if (boost::size(ring)
+ if (int(boost::size(ring))
< core_detail::closure::minimum_ring_size<Closure>::value)
{
return type();
Modified: trunk/boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp (original)
+++ trunk/boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp 2012-05-25 10:27:09 EDT (Fri, 25 May 2012)
@@ -55,14 +55,14 @@
if (second)
{
index++;
- if (index >= boost::size(range))
+ if (index >= int(boost::size(range)))
{
index = 0;
}
}
// Exception?
- if (index >= boost::size(range))
+ if (index >= int(boost::size(range)))
{
return false;
}
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:27:09 EDT (Fri, 25 May 2012)
@@ -78,7 +78,7 @@
int const from_index = seg_id.segment_index + 1;
// Sanity check
- BOOST_ASSERT(from_index < boost::size(view));
+ BOOST_ASSERT(from_index < int(boost::size(view)));
ec_iterator it(boost::begin(view), boost::end(view),
boost::begin(view) + from_index);
Modified: trunk/boost/geometry/algorithms/detail/overlay/get_ring.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/detail/overlay/get_ring.hpp (original)
+++ trunk/boost/geometry/algorithms/detail/overlay/get_ring.hpp 2012-05-25 10:27:09 EDT (Fri, 25 May 2012)
@@ -83,7 +83,7 @@
BOOST_ASSERT
(
id.ring_index >= -1
- && id.ring_index < boost::size(interior_rings(polygon))
+ && id.ring_index < int(boost::size(interior_rings(polygon)))
);
return id.ring_index < 0
? exterior_ring(polygon)
Modified: trunk/boost/geometry/algorithms/detail/partition.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/detail/partition.hpp (original)
+++ trunk/boost/geometry/algorithms/detail/partition.hpp 2012-05-25 10:27:09 EDT (Fri, 25 May 2012)
@@ -153,7 +153,7 @@
static inline void next_level(Box const& box,
InputCollection const& collection,
index_vector_type const& input,
- int level, int min_elements,
+ int level, std::size_t min_elements,
Policy& policy, VisitBoxPolicy& box_policy)
{
if (boost::size(input) > 0)
@@ -176,7 +176,7 @@
InputCollection const& collection,
index_vector_type const& input,
int level,
- int min_elements,
+ std::size_t min_elements,
Policy& policy, VisitBoxPolicy& box_policy)
{
box_policy.apply(box, level);
@@ -230,7 +230,7 @@
index_vector_type const& input1,
InputCollection const& collection2,
index_vector_type const& input2,
- int level, int min_elements,
+ int level, std::size_t min_elements,
Policy& policy, VisitBoxPolicy& box_policy)
{
if (boost::size(input1) > 0 && boost::size(input2) > 0)
@@ -257,7 +257,7 @@
InputCollection const& collection1, index_vector_type const& input1,
InputCollection const& collection2, index_vector_type const& input2,
int level,
- int min_elements,
+ std::size_t min_elements,
Policy& policy, VisitBoxPolicy& box_policy)
{
box_policy.apply(box, level);
@@ -335,7 +335,7 @@
template <typename InputCollection, typename VisitPolicy>
static inline void apply(InputCollection const& collection,
VisitPolicy& visitor,
- int min_elements = 16,
+ std::size_t min_elements = 16,
VisitBoxPolicy box_visitor = visit_no_policy()
)
{
@@ -377,7 +377,7 @@
static inline void apply(InputCollection const& collection1,
InputCollection const& collection2,
VisitPolicy& visitor,
- int min_elements = 16,
+ std::size_t min_elements = 16,
VisitBoxPolicy box_visitor = visit_no_policy()
)
{
Modified: trunk/boost/geometry/algorithms/detail/sections/sectionalize.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/detail/sections/sectionalize.hpp (original)
+++ trunk/boost/geometry/algorithms/detail/sections/sectionalize.hpp 2012-05-25 10:27:09 EDT (Fri, 25 May 2012)
@@ -254,7 +254,7 @@
Range const& range,
ring_identifier ring_id)
{
- if (boost::size(range) <= index)
+ if (int(boost::size(range)) <= index)
{
return;
}
Modified: trunk/boost/geometry/algorithms/within.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/within.hpp (original)
+++ trunk/boost/geometry/algorithms/within.hpp 2012-05-25 10:27:09 EDT (Fri, 25 May 2012)
@@ -65,7 +65,7 @@
static inline int apply(Point const& point, Ring const& ring,
Strategy const& strategy)
{
- if (boost::size(ring)
+ if (int(boost::size(ring))
< core_detail::closure::minimum_ring_size<Closure>::value)
{
return -1;