Merge pull request #625 from arvidn/fix-warnings-1.1

fix warnings 1.1

.travis.yml

@@ -111,7 +111,7 @@ script:
 
   - cd simulation
   - if [ $sim = "1" ]; then
-    bjam --hash -j2 crypto=built-in $coverage_toolset;
+    bjam --hash -j2 crypto=built-in warnings-as-errors=on $coverage_toolset;
     fi
   - cd ..
   - ccache --show-stats

simulation/libsimulator

@@ -1 +1 @@
-Subproject commit 0151d5c17fa3f4cf0ce518d0b8f90a23792c9b24
+Subproject commit ad23c932ecd852f89c7d8b29dfe162e9ee073a1b

simulation/test_tracker.cpp

@@ -663,7 +663,7 @@ TORRENT_TEST(try_next)
 
 			TEST_EQUAL(tr.size(), 3);
 
-			for (int i = 0; i < tr.size(); ++i)
+			for (int i = 0; i < int(tr.size()); ++i)
 			{
 				fprintf(stderr, "tracker \"%s\"\n", tr[i].url.c_str());
 				if (tr[i].url == "http://tracker.com:8080/announce")
@@ -732,7 +732,7 @@ TORRENT_TEST(tracker_ipv6_argument)
 			, std::map<std::string, std::string>& headers)
 		{
 			got_announce = true;
-			int pos = req.find("&ipv6=");
+			std::string::size_type pos = req.find("&ipv6=");
 			TEST_CHECK(pos != std::string::npos);
 			got_ipv6 = pos != std::string::npos;
 			return sim::send_response(200, "OK", 11) + "d5:peers0:e";
@@ -762,7 +762,7 @@ TORRENT_TEST(tracker_ipv6_argument_non_private)
 			, std::map<std::string, std::string>& headers)
 		{
 			got_announce = true;
-			int pos = req.find("&ipv6=");
+			std::string::size_type pos = req.find("&ipv6=");
 			TEST_CHECK(pos == std::string::npos);
 			got_ipv6 = pos != std::string::npos;
 			return sim::send_response(200, "OK", 11) + "d5:peers0:e";
@@ -790,7 +790,7 @@ TORRENT_TEST(tracker_ipv6_argument_privacy_mode)
 			, std::map<std::string, std::string>& headers)
 		{
 			got_announce = true;
-			int pos = req.find("&ipv6=");
+			std::string::size_type pos = req.find("&ipv6=");
 			TEST_CHECK(pos == std::string::npos);
 			got_ipv6 = pos != std::string::npos;
 			return sim::send_response(200, "OK", 11) + "d5:peers0:e";