merged back async_io branch into trunk

This commit is contained in:
Arvid Norberg
2007-06-10 20:46:09 +00:00
parent 36031f82ed
commit 3b8670626a
45 changed files with 1532 additions and 831 deletions

View File

@@ -75,7 +75,6 @@ void test_transfer(libtorrent::pe_settings::enc_policy policy,
bool pref_rc4 = false)
{
using namespace libtorrent;
using boost::tuples::ignore;
using std::cerr;
session ses1(fingerprint("LT", 0, 1, 0, 0), std::make_pair(48000, 49000));
@@ -104,6 +103,7 @@ void test_transfer(libtorrent::pe_settings::enc_policy policy,
torrent_handle tor1;
torrent_handle tor2;
using boost::tuples::ignore;
boost::tie(tor1, tor2, ignore) = setup_transfer(&ses1, &ses2, 0, true, false);
std::cerr << "waiting for transfer to complete\n";
@@ -121,7 +121,7 @@ void test_transfer(libtorrent::pe_settings::enc_policy policy,
std::cerr << "ses2: " << a->msg() << "\n";
if (tor2.is_seed()) break;
sleep(100);
test_sleep(100);
}
TEST_CHECK(tor2.is_seed());