fix a few -Wsign-compare warnings

mapbox · May 19, 2014 · d3d0704 · d3d0704
1 parent 84fdc9e
commit d3d0704
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ ifeq (sizes,$(firstword $(MAKECMDGOALS)))
   .PHONY: $(RUN_ARGS)
 endif
 
-all: out/bench-variant
+all: out/bench-variant out/unique_ptr_test out/unique_ptr_test out/recursive_wrapper_test out/binary_visitor_test
 
 out/bench-variant-debug: Makefile test/bench_variant.cpp variant.hpp
 	mkdir -p ./out

diff --git a/test/binary_visitor_test.cpp b/test/binary_visitor_test.cpp
@@ -94,7 +94,7 @@ struct javascript_equal
 
 }
 
-int main (int argc, char** argv)
+int main (/*int argc, char** argv*/)
 {
     //typedef util::variant<int, std::string> variant_type;
     typedef util::variant<bool, int64_t, uint64_t, double, std::string> variant_type;

diff --git a/test/recursive_wrapper_test.cpp b/test/recursive_wrapper_test.cpp
@@ -107,7 +107,7 @@ int main (int argc, char** argv)
         return EXIT_FAILURE;
     }
 
-    std::size_t const NUM_ITER = std::stoll(argv[1]);
+    const std::size_t NUM_ITER = static_cast<std::size_t>(std::stol(argv[1]));
 
     test::expression result(util::recursive_wrapper<test::binary_op<test::sub> >(
                                 test::binary_op<test::sub>(
@@ -119,9 +119,9 @@ int main (int argc, char** argv)
     {
         boost::timer::auto_cpu_timer t;
         std::size_t total = 0;
-        for (int i = 0; i < NUM_ITER; ++i)
+        for (std::size_t i = 0; i < NUM_ITER; ++i)
         {
-            total +=util::apply_visitor(result, test::calculator());
+            total += static_cast<std::size_t>(util::apply_visitor(result, test::calculator()));
         }
         std::cerr << "total=" << total << std::endl;
     }

diff --git a/test/unique_ptr_test.cpp b/test/unique_ptr_test.cpp
@@ -104,7 +104,7 @@ int main (int argc, char** argv)
         return EXIT_FAILURE;
     }
 
-    std::size_t const NUM_ITER = std::stoll(argv[1]);
+    const std::size_t NUM_ITER = static_cast<std::size_t>(std::stol(argv[1]));
 
     test::expression sum(std::unique_ptr<test::binary_op<test::add>>(new test::binary_op<test::add>(2,3)));
     test::expression result(std::unique_ptr<test::binary_op<test::sub>>(new test::binary_op<test::sub>(std::move(sum),10)));
@@ -113,9 +113,9 @@ int main (int argc, char** argv)
     {
         boost::timer::auto_cpu_timer t;
         std::size_t total = 0;
-        for (int i = 0; i < NUM_ITER; ++i)
+        for (std::size_t i = 0; i < NUM_ITER; ++i)
         {
-            total +=util::apply_visitor(result, test::calculator());
+            total += static_cast<std::size_t>(util::apply_visitor(result, test::calculator()));
         }
         std::cerr << "total=" << total << std::endl;
     }