merge checking fix from RC_0_16

2013-01-06 04:53:26 +00:00
parent e45124fc22
commit 38d7e58177
9 changed files with 213 additions and 42 deletions
--- a/test/setup_transfer.hpp
+++ b/test/setup_transfer.hpp
@@ -55,6 +55,8 @@ void test_sleep(int millisec);
 extern int g_udp_tracker_requests;
 extern int g_http_tracker_requests;

+void create_random_files(std::string const& path, const int file_sizes[], int num_files);
+
 boost::intrusive_ptr<libtorrent::torrent_info> create_torrent(std::ostream* file = 0
 	, int piece_size = 16 * 1024, int num_pieces = 13, bool add_tracker = true, bool encrypted = false);