From 3261c529766dbce512ded27fc050d781951ea7e5 Mon Sep 17 00:00:00 2001 From: Barend Gehrels Date: Thu, 19 Jun 2014 19:10:49 +0200 Subject: [PATCH] [buffer] Avoid warnings --- .../detail/buffer/buffered_piece_collection.hpp | 6 +++--- .../boost/geometry/algorithms/detail/occupation_info.hpp | 9 +++++---- .../strategies/agnostic/buffer_distance_symmetric.hpp | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp b/include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp index de44f08d7..bba0bc35e 100644 --- a/include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp +++ b/include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp @@ -297,7 +297,7 @@ struct buffered_piece_collection { typename buffer_occupation_info::turn_vector_type const& turns = it->second.turns; bool blocked = false; - for (int i = 0; i < turns.size(); i++) + for (std::size_t i = 0; i < turns.size(); i++) { if (m_turns[turns[i].turn_index].blocked()) { @@ -307,7 +307,7 @@ struct buffered_piece_collection } if (blocked) { - for (int i = 0; i < turns.size(); i++) + for (std::size_t i = 0; i < turns.size(); i++) { m_turns[turns[i].turn_index].count_on_occupied++; } @@ -320,7 +320,7 @@ struct buffered_piece_collection it != occupation_map.end(); ++it) { typename buffer_occupation_info::turn_vector_type const& turns = it->second.turns; - for (int i = 0; i < turns.size(); i++) + for (std::size_t i = 0; i < turns.size(); i++) { m_turns[turns[i].turn_index].selectable_start = false; } diff --git a/include/boost/geometry/algorithms/detail/occupation_info.hpp b/include/boost/geometry/algorithms/detail/occupation_info.hpp index dd42519b4..92c07006f 100644 --- a/include/boost/geometry/algorithms/detail/occupation_info.hpp +++ b/include/boost/geometry/algorithms/detail/occupation_info.hpp @@ -132,8 +132,8 @@ template inline void move_index(Pieces const& pieces, int& index, int& piece_index, int direction) { BOOST_ASSERT(direction == 1 || direction == -1); - BOOST_ASSERT(piece_index >= 0 && piece_index < boost::size(pieces)); - BOOST_ASSERT(index >= 0 && index < boost::size(pieces[piece_index].robust_ring)); + BOOST_ASSERT(piece_index >= 0 && piece_index < static_cast(boost::size(pieces)) ); + BOOST_ASSERT(index >= 0 && index < static_cast(boost::size(pieces[piece_index].robust_ring))); index += direction; if (direction == -1 && index < 0) @@ -145,10 +145,11 @@ inline void move_index(Pieces const& pieces, int& index, int& piece_index, int d } index = boost::size(pieces[piece_index].robust_ring) - 1; } - if (direction == 1 && index >= boost::size(pieces[piece_index].robust_ring)) + if (direction == 1 + && index >= static_cast(boost::size(pieces[piece_index].robust_ring))) { piece_index++; - if (piece_index >= boost::size(pieces)) + if (piece_index >= static_cast(boost::size(pieces))) { piece_index = 0; } diff --git a/include/boost/geometry/strategies/agnostic/buffer_distance_symmetric.hpp b/include/boost/geometry/strategies/agnostic/buffer_distance_symmetric.hpp index 8a830e3a5..9fd7a22b6 100644 --- a/include/boost/geometry/strategies/agnostic/buffer_distance_symmetric.hpp +++ b/include/boost/geometry/strategies/agnostic/buffer_distance_symmetric.hpp @@ -29,7 +29,7 @@ public : template inline CoordinateType apply(Point const& , Point const& , - buffer_side_selector side) const + buffer_side_selector ) const { return m_distance; }