[Boost-commit] svn:boost r65924 - sandbox/geometry/libs/geometry/test/algorithms

Subject: [Boost-commit] svn:boost r65924 - sandbox/geometry/libs/geometry/test/algorithms
From: barend.gehrels_at_[hidden]
Date: 2010-10-12 09:17:12

Author: barendgehrels
Date: 2010-10-12 09:17:09 EDT (Tue, 12 Oct 2010)
New Revision: 65924
URL: http://svn.boost.org/trac/boost/changeset/65924

Log:
Silenced gcc warnings
Text files modified: 
   sandbox/geometry/libs/geometry/test/algorithms/convert.cpp      |     6 +++---                                  
   sandbox/geometry/libs/geometry/test/algorithms/sectionalize.cpp |    12 +++++-------                            
   2 files changed, 8 insertions(+), 10 deletions(-)

Modified: sandbox/geometry/libs/geometry/test/algorithms/convert.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/convert.cpp	(original)
+++ sandbox/geometry/libs/geometry/test/algorithms/convert.cpp	2010-10-12 09:17:09 EDT (Tue, 12 Oct 2010)
@@ -73,16 +73,16 @@
     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* [])

Modified: sandbox/geometry/libs/geometry/test/algorithms/sectionalize.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/sectionalize.cpp	(original)
+++ sandbox/geometry/libs/geometry/test/algorithms/sectionalize.cpp	2010-10-12 09:17:09 EDT (Tue, 12 Oct 2010)
@@ -59,8 +59,7 @@
 
 template <int DimensionCount, typename G>
 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<G>::type point;
     typedef bg::box<point> box;
@@ -79,7 +78,7 @@
         {
             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 @@
 template <typename G>
 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 <typename P>