From 144e54d482b2cf782e73365024ad6d393a9f71ef Mon Sep 17 00:00:00 2001 From: Barend Gehrels Date: Tue, 12 Oct 2010 13:17:09 +0000 Subject: [PATCH] Silenced gcc warnings [SVN r65924] --- test/algorithms/convert.cpp | 6 +++--- test/algorithms/sectionalize.cpp | 12 +++++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/test/algorithms/convert.cpp b/test/algorithms/convert.cpp index a78f263f3..dde11ecc5 100644 --- a/test/algorithms/convert.cpp +++ b/test/algorithms/convert.cpp @@ -73,16 +73,16 @@ void test_std() BOOST_CHECK_CLOSE(double(boost::geometry::get<0>(*it)), 1.0, 0.001); BOOST_CHECK_CLOSE(double(boost::geometry::get<1>(*it)), 2.0, 0.001); - BOOST_CHECK_EQUAL(ring.size(), 5); + BOOST_CHECK_EQUAL(ring.size(), 5u); polygon_type polygon; boost::geometry::convert(ring, polygon); - BOOST_CHECK_EQUAL(boost::geometry::num_points(polygon), 5); + BOOST_CHECK_EQUAL(boost::geometry::num_points(polygon), 5u); boost::geometry::convert(polygon, ring); - BOOST_CHECK_EQUAL(boost::geometry::num_points(ring), 5); + BOOST_CHECK_EQUAL(boost::geometry::num_points(ring), 5u); } int test_main(int, char* []) diff --git a/test/algorithms/sectionalize.cpp b/test/algorithms/sectionalize.cpp index 75492e4cd..857078b5f 100644 --- a/test/algorithms/sectionalize.cpp +++ b/test/algorithms/sectionalize.cpp @@ -59,8 +59,7 @@ void test_sectionalize_part() template void test_sectionalize(G const& g, std::size_t section_count, - std::string const& index_check, std::string const& dir_check, - bool sort = false) + std::string const& index_check, std::string const& dir_check) { typedef typename bg::point_type::type point; typedef bg::box box; @@ -79,7 +78,7 @@ void test_sectionalize(G const& g, std::size_t section_count, { BOOST_CHECK_EQUAL(previous_index, sec.begin_index); } - BOOST_CHECK_EQUAL(sec.count, sec.end_index - sec.begin_index); + BOOST_CHECK_EQUAL(int(sec.count), int(sec.end_index - sec.begin_index)); previous_index = sec.end_index; } @@ -139,13 +138,12 @@ void test_sectionalize(G const& g, std::size_t section_count, template void test_sectionalize(std::string const& wkt, std::size_t count2, std::string const& s2, std::string const d2, - std::size_t count1, std::string const& s1, std::string const d1, - bool sort = false) + std::size_t count1, std::string const& s1, std::string const d1) { G g; bg::read_wkt(wkt, g); - test_sectionalize<2>(g, count2, s2, d2, sort); - test_sectionalize<1>(g, count1, s1, d1, sort); + test_sectionalize<2>(g, count2, s2, d2); + test_sectionalize<1>(g, count1, s1, d1); } template