Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r78713 - trunk/boost/geometry/algorithms/detail
From: barend.gehrels_at_[hidden]
Date: 2012-05-28 07:40:46


Author: barendgehrels
Date: 2012-05-28 07:40:46 EDT (Mon, 28 May 2012)
New Revision: 78713
URL: http://svn.boost.org/trac/boost/changeset/78713

Log:
[geometry] now casted size the other side as well to account for possible non-merge of Boost.Range
Text files modified:
   trunk/boost/geometry/algorithms/detail/partition.hpp | 12 ++++++------
   1 files changed, 6 insertions(+), 6 deletions(-)

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-28 07:40:46 EDT (Mon, 28 May 2012)
@@ -158,7 +158,7 @@
     {
         if (boost::size(input) > 0)
         {
- if (boost::size(input) > min_elements && level < 100)
+ if (std::size_t(boost::size(input)) > min_elements && level < 100)
             {
                 sub_divide::apply(box, collection, input, level + 1,
                             min_elements, policy, box_policy);
@@ -235,8 +235,8 @@
     {
         if (boost::size(input1) > 0 && boost::size(input2) > 0)
         {
- if (boost::size(input1) > min_elements
- && boost::size(input2) > min_elements
+ if (std::size_t(boost::size(input1)) > min_elements
+ && std::size_t(boost::size(input2)) > min_elements
                 && level < 100)
             {
                 sub_divide::apply(box, collection1, input1, collection2,
@@ -339,7 +339,7 @@
             VisitBoxPolicy box_visitor = visit_no_policy()
             )
     {
- if (boost::size(collection) > min_elements)
+ if (std::size_t(boost::size(collection)) > min_elements)
         {
             index_vector_type index_vector;
             Box total;
@@ -381,8 +381,8 @@
                 VisitBoxPolicy box_visitor = visit_no_policy()
                 )
     {
- if (boost::size(collection1) > min_elements
- && boost::size(collection2) > min_elements)
+ if (std::size_t(boost::size(collection1)) > min_elements
+ && std::size_t(boost::size(collection2)) > min_elements)
         {
             index_vector_type index_vector1, index_vector2;
             Box total;


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk