diff --git a/include/libtorrent/network_thread_pool.hpp b/include/libtorrent/network_thread_pool.hpp index 577fc0857..f386f239b 100644 --- a/include/libtorrent/network_thread_pool.hpp +++ b/include/libtorrent/network_thread_pool.hpp @@ -45,7 +45,7 @@ namespace libtorrent struct socket_job { - socket_job() : vec(NULL), recv_buf(NULL), buf_size(0), type(none) {} + socket_job() : type(none), vec(NULL), recv_buf(NULL), buf_size(0) {} enum job_type_t { diff --git a/test/setup_transfer.cpp b/test/setup_transfer.cpp index f4832ce97..871e6b919 100644 --- a/test/setup_transfer.cpp +++ b/test/setup_transfer.cpp @@ -89,7 +89,7 @@ address rand_v4() address rand_v6() { address_v6::bytes_type bytes; - for (int i = 0; i < bytes.size(); ++i) bytes[i] = rand(); + for (int i = 0; i < int(bytes.size()); ++i) bytes[i] = rand(); return address_v6(bytes); } #endif @@ -138,7 +138,7 @@ std::map get_counters(libtorrent::session& s) if (!sa) return ret; static std::vector metrics = session_stats_metrics(); - for (int i = 0; i < metrics.size(); ++i) + for (int i = 0; i < int(metrics.size()); ++i) ret[metrics[i].name] = sa->values[metrics[i].value_index]; return ret; } diff --git a/test/test_gzip.cpp b/test/test_gzip.cpp index 86341a9d4..a58a78d25 100644 --- a/test/test_gzip.cpp +++ b/test/test_gzip.cpp @@ -55,7 +55,7 @@ int test_main() } TEST_CHECK(!ec); TEST_CHECK(inflated.size() > 0); - for (int i = 0; i < inflated.size(); ++i) + for (int i = 0; i < int(inflated.size()); ++i) TEST_EQUAL(inflated[i], 0); return 0; diff --git a/test/test_peer_list.cpp b/test/test_peer_list.cpp index 57dff3e85..9fa494e93 100644 --- a/test/test_peer_list.cpp +++ b/test/test_peer_list.cpp @@ -905,6 +905,7 @@ int test_main() TEST_CHECK(peer5); TEST_EQUAL(p.num_peers(), 5); torrent_peer* peer6 = p.add_peer(ep("10.0.0.6", 8080), 0, 0, &st); + TEST_CHECK(peer6 == NULL); TEST_EQUAL(p.num_peers(), 5); // one of the connection should have been removed diff --git a/test/test_piece_picker.cpp b/test/test_piece_picker.cpp index ed4256661..872582e8c 100644 --- a/test/test_piece_picker.cpp +++ b/test/test_piece_picker.cpp @@ -1810,7 +1810,7 @@ int test_main() picked = pick_pieces(p, "*******", 7 * blocks_per_piece, 0, tmp_peer , piece_picker::rarest_first | piece_picker::time_critical_mode, empty_vector); TEST_EQUAL(picked.size(), blocks_per_piece); - for (int i = 0; i < picked.size(); ++i) + for (int i = 0; i < int(picked.size()); ++i) TEST_EQUAL(picked[0].piece_index, 4); // reverse rarest-first @@ -1818,14 +1818,14 @@ int test_main() , piece_picker::reverse | piece_picker::rarest_first | piece_picker::time_critical_mode, empty_vector); TEST_EQUAL(picked.size(), blocks_per_piece); - for (int i = 0; i < picked.size(); ++i) + for (int i = 0; i < int(picked.size()); ++i) TEST_EQUAL(picked[0].piece_index, 4); // sequential picked = pick_pieces(p, "*******", 7 * blocks_per_piece, 0, tmp_peer , piece_picker::sequential | piece_picker::time_critical_mode, empty_vector); TEST_EQUAL(picked.size(), blocks_per_piece); - for (int i = 0; i < picked.size(); ++i) + for (int i = 0; i < int(picked.size()); ++i) TEST_EQUAL(picked[0].piece_index, 4); // reverse sequential @@ -1833,21 +1833,21 @@ int test_main() , piece_picker::reverse | piece_picker::sequential | piece_picker::time_critical_mode, empty_vector); TEST_EQUAL(picked.size(), blocks_per_piece); - for (int i = 0; i < picked.size(); ++i) + for (int i = 0; i < int(picked.size()); ++i) TEST_EQUAL(picked[0].piece_index, 4); // just critical picked = pick_pieces(p, "*******", 7 * blocks_per_piece, 0, tmp_peer , piece_picker::time_critical_mode, empty_vector); TEST_EQUAL(picked.size(), blocks_per_piece); - for (int i = 0; i < picked.size(); ++i) + for (int i = 0; i < int(picked.size()); ++i) TEST_EQUAL(picked[0].piece_index, 4); // prioritize_partials picked = pick_pieces(p, "*******", 7 * blocks_per_piece, 0, tmp_peer , piece_picker::prioritize_partials | piece_picker::time_critical_mode, empty_vector); TEST_EQUAL(picked.size(), blocks_per_piece); - for (int i = 0; i < picked.size(); ++i) + for (int i = 0; i < int(picked.size()); ++i) TEST_EQUAL(picked[0].piece_index, 4); // even when a non-critical piece is suggested should we ignore it @@ -1855,7 +1855,7 @@ int test_main() , piece_picker::rarest_first | piece_picker::time_critical_mode , suggested_pieces); TEST_EQUAL(picked.size(), blocks_per_piece); - for (int i = 0; i < picked.size(); ++i) + for (int i = 0; i < int(picked.size()); ++i) TEST_EQUAL(picked[0].piece_index, 4); return 0; diff --git a/test/test_sliding_average.cpp b/test/test_sliding_average.cpp index 2a9e10444..731a0274e 100644 --- a/test/test_sliding_average.cpp +++ b/test/test_sliding_average.cpp @@ -86,7 +86,7 @@ int test_main() // test with a more realistic input { sliding_average<10> avg; - for (int i = 0; i < sizeof(samples)/sizeof(samples[0]); ++i) + for (int i = 0; i < int(sizeof(samples)/sizeof(samples[0])); ++i) avg.add_sample(samples[i]); TEST_CHECK(abs(avg.mean() - 60) <= 3); } diff --git a/test/test_storage.cpp b/test/test_storage.cpp index 42019815c..62a78363c 100644 --- a/test/test_storage.cpp +++ b/test/test_storage.cpp @@ -811,7 +811,7 @@ void fill_pattern(file::iovec_t* iov, int num_bufs) for (int i = 0; i < num_bufs; ++i) { unsigned char* buf = (unsigned char*)iov[i].iov_base; - for (int k = 0; k < iov[i].iov_len; ++k) + for (int k = 0; k < int(iov[i].iov_len); ++k) { buf[k] = counter & 0xff; ++counter; @@ -824,7 +824,7 @@ void fill_pattern2(file::iovec_t* iov, int num_bufs) for (int i = 0; i < num_bufs; ++i) { unsigned char* buf = (unsigned char*)iov[i].iov_base; - memset(buf, 0xfe, iov[i].iov_len); + memset(buf, 0xfe, int(iov[i].iov_len)); } } @@ -858,7 +858,7 @@ void test_iovec_copy_bufs() for (int i = 0; i < num_bufs; ++i) { unsigned char* buf = (unsigned char*)iov2[i].iov_base; - for (int k = 0; k < iov2[i].iov_len; ++k) + for (int k = 0; k < int(iov2[i].iov_len); ++k) { TEST_EQUAL(int(buf[k]), (counter & 0xff)); ++counter; @@ -879,7 +879,7 @@ void test_iovec_clear_bufs() for (int i = 0; i < 10; ++i) { unsigned char* buf = (unsigned char*)iov[i].iov_base; - for (int k = 0; k < iov[i].iov_len; ++k) + for (int k = 0; k < int(iov[i].iov_len); ++k) { TEST_EQUAL(int(buf[k]), 0); } @@ -924,7 +924,7 @@ void test_iovec_advance_bufs() for (int i = 0; i < end - iov; ++i) { unsigned char* buf = (unsigned char*)iov[i].iov_base; - for (int k = 0; k < iov[i].iov_len; ++k) + for (int k = 0; k < int(iov[i].iov_len); ++k) { TEST_EQUAL(int(buf[k]), (counter & 0xff)); ++counter; diff --git a/test/test_torrent_info.cpp b/test/test_torrent_info.cpp index 53b4ea1a6..8619d33ab 100644 --- a/test/test_torrent_info.cpp +++ b/test/test_torrent_info.cpp @@ -352,7 +352,7 @@ int test_torrent_parse() TEST_CHECK(test == "filename____"); std::string root_dir = parent_path(current_working_directory()); - for (int i = 0; i < sizeof(test_torrents)/sizeof(test_torrents[0]); ++i) + for (int i = 0; i < int(sizeof(test_torrents)/sizeof(test_torrents[0])); ++i) { fprintf(stderr, "loading %s\n", test_torrents[i].file); std::string filename = combine_path(combine_path(root_dir, "test_torrents") @@ -495,7 +495,7 @@ int test_torrent_parse() } - for (int i = 0; i < sizeof(test_error_torrents)/sizeof(test_error_torrents[0]); ++i) + for (int i = 0; i < int(sizeof(test_error_torrents)/sizeof(test_error_torrents[0])); ++i) { error_code ec; fprintf(stderr, "loading %s\n", test_error_torrents[i].file);