From 21b51afd5f8e5d46bb14d260b04aacf3253cb9ba Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Mon, 2 Apr 2012 03:32:26 +0000
Subject: [PATCH] merge windows fix from RC_0_16

---
 include/libtorrent/piece_picker.hpp    | 4 ++++
 include/libtorrent/sliding_average.hpp | 2 +-
 test/test_torrent.cpp                  | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/libtorrent/piece_picker.hpp b/include/libtorrent/piece_picker.hpp
index 34911014a..c5cd4e4df 100644
--- a/include/libtorrent/piece_picker.hpp
+++ b/include/libtorrent/piece_picker.hpp
@@ -595,7 +595,11 @@ namespace libtorrent
 		mutable bool m_dirty;
 	public:
 
+#if TORRENT_COMPACT_PICKER
 		enum { max_pieces = piece_pos::we_have_index - 1 };
+#else
+		enum { max_pieces = INT_MAX };
+#endif
 
 	};
 }
diff --git a/include/libtorrent/sliding_average.hpp b/include/libtorrent/sliding_average.hpp
index d540f8546..6c8352cc1 100644
--- a/include/libtorrent/sliding_average.hpp
+++ b/include/libtorrent/sliding_average.hpp
@@ -88,7 +88,7 @@ struct average_accumulator
 	{
 		int ret;
 		if (m_num_samples == 0) ret = 0;
-		else ret = m_sample_sum / m_num_samples;
+		else ret = int(m_sample_sum / m_num_samples);
 		m_num_samples = 0;
 		m_sample_sum = 0;
 		return ret;
diff --git a/test/test_torrent.cpp b/test/test_torrent.cpp
index 3a6cdfe9b..ca028cfba 100644
--- a/test/test_torrent.cpp
+++ b/test/test_torrent.cpp
@@ -94,14 +94,14 @@ void test_running_torrent(boost::intrusive_ptr<torrent_info> info, size_type fil
 	{
 		h.piece_priority(0, 1);
 		st = h.status();
-		TEST_CHECK(st.pieces[0] == false);
+		TEST_CHECK(st.pieces.size() > 0 && st.pieces[0] == false);
 		std::vector<char> piece(info->piece_length());
 		for (int i = 0; i < int(piece.size()); ++i)
 			piece[i] = (i % 26) + 'A';
 		h.add_piece(0, &piece[0]);
 		test_sleep(10000);
 		st = h.status();
-		TEST_CHECK(st.pieces[0] == true);
+		TEST_CHECK(st.pieces.size() > 0 && st.pieces[0] == true);
 
 		std::cout << "reading piece 0" << std::endl;
 		h.read_piece(0);