jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

boost detection fixes: now able to launch with boost1.34 and boost1.35

Browse Source
This commit is contained in:
roman_rybalko
2008-06-13 12:20:55 +00:00
parent 7df5d4a9c6
commit 5314b639e2
13 changed files with 220 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/test_buffer.cpp
View File

@@ -192,9 +192,9 @@ int copy_buffers(T const& b, char* target)
for (typename T::const_iterator i = b.begin()
, end(b.end()); i != end; ++i)
{
memcpy(target, asio::buffer_cast<char const*>(*i), asio::buffer_size(*i));
target += asio::buffer_size(*i);
copied += asio::buffer_size(*i);
memcpy(target, libtorrent::asio::buffer_cast<char const*>(*i), libtorrent::asio::buffer_size(*i));
target += libtorrent::asio::buffer_size(*i);
copied += libtorrent::asio::buffer_size(*i);
}
return copied;
}
@@ -203,7 +203,7 @@ bool compare_chained_buffer(chained_buffer& b, char const* mem, int size)
{
if (size == 0) return true;
std::vector<char> flat(size);
std::list<asio::const_buffer> const& iovec2 = b.build_iovec(size);
std::list<libtorrent::asio::const_buffer> const& iovec2 = b.build_iovec(size);
int copied = copy_buffers(iovec2, &flat[0]);
TEST_CHECK(copied == size);
return std::memcmp(&flat[0], mem, size) == 0;

22
test/test_fast_extension.cpp
View File

@@ -11,7 +11,7 @@ int read_message(stream_socket& s, char* buffer)
{
using namespace libtorrent::detail;
error_code ec;
asio::read(s, asio::buffer(buffer, 4), asio::transfer_all(), ec);
libtorrent::asio::read(s, libtorrent::asio::buffer(buffer, 4), libtorrent::asio::transfer_all(), ec);
if (ec)
{
std::cout << ec.message() << std::endl;
@@ -20,7 +20,7 @@ int read_message(stream_socket& s, char* buffer)
char* ptr = buffer;
int length = read_int32(ptr);
asio::read(s, asio::buffer(buffer, length), asio::transfer_all(), ec);
libtorrent::asio::read(s, libtorrent::asio::buffer(buffer, length), libtorrent::asio::transfer_all(), ec);
if (ec)
{
std::cout << ec.message() << std::endl;
@@ -41,7 +41,7 @@ void send_allow_fast(stream_socket& s, int piece)
char* ptr = msg + 5;
write_int32(piece, ptr);
error_code ec;
asio::write(s, asio::buffer(msg, 9), asio::transfer_all(), ec);
libtorrent::asio::write(s, libtorrent::asio::buffer(msg, 9), libtorrent::asio::transfer_all(), ec);
if (ec)
{
std::cout << ec.message() << std::endl;
@@ -57,7 +57,7 @@ void send_suggest_piece(stream_socket& s, int piece)
char* ptr = msg + 5;
write_int32(piece, ptr);
error_code ec;
asio::write(s, asio::buffer(msg, 9), asio::transfer_all(), ec);
libtorrent::asio::write(s, libtorrent::asio::buffer(msg, 9), libtorrent::asio::transfer_all(), ec);
if (ec)
{
std::cout << ec.message() << std::endl;
@@ -70,7 +70,7 @@ void send_unchoke(stream_socket& s)
std::cout << "send unchoke" << std::endl;
char msg[] = "\0\0\0\x01\x01";
error_code ec;
asio::write(s, asio::buffer(msg, 5), asio::transfer_all(), ec);
libtorrent::asio::write(s, libtorrent::asio::buffer(msg, 5), libtorrent::asio::transfer_all(), ec);
if (ec)
{
std::cout << ec.message() << std::endl;
@@ -87,7 +87,7 @@ void do_handshake(stream_socket& s, sha1_hash const& ih, char* buffer)
std::cout << "send handshake" << std::endl;
error_code ec;
std::memcpy(handshake + 28, ih.begin(), 20);
asio::write(s, asio::buffer(handshake, sizeof(handshake) - 1), asio::transfer_all(), ec);
libtorrent::asio::write(s, libtorrent::asio::buffer(handshake, sizeof(handshake) - 1), libtorrent::asio::transfer_all(), ec);
if (ec)
{
std::cout << ec.message() << std::endl;
@@ -95,7 +95,7 @@ void do_handshake(stream_socket& s, sha1_hash const& ih, char* buffer)
}
// read handshake
asio::read(s, asio::buffer(buffer, 68), asio::transfer_all(), ec);
libtorrent::asio::read(s, libtorrent::asio::buffer(buffer, 68), libtorrent::asio::transfer_all(), ec);
if (ec)
{
std::cout << ec.message() << std::endl;
@@ -172,13 +172,13 @@ void test_reject_fast()
// send reject request
recv_buffer[0] = 0x10;
error_code ec;
asio::write(s, asio::buffer("\0\0\0\x0d", 4), asio::transfer_all(), ec);
libtorrent::asio::write(s, libtorrent::asio::buffer("\0\0\0\x0d", 4), libtorrent::asio::transfer_all(), ec);
if (ec)
{
std::cout << ec.message() << std::endl;
exit(1);
}
asio::write(s, asio::buffer(recv_buffer, 13), asio::transfer_all(), ec);
libtorrent::asio::write(s, libtorrent::asio::buffer(recv_buffer, 13), libtorrent::asio::transfer_all(), ec);
std::cout << ec.message() << std::endl;
if (ec)
{
@@ -240,13 +240,13 @@ void test_respect_suggest()
// send reject request
recv_buffer[0] = 0x10;
error_code ec;
asio::write(s, asio::buffer("\0\0\0\x0d", 4), asio::transfer_all(), ec);
libtorrent::asio::write(s, libtorrent::asio::buffer("\0\0\0\x0d", 4), libtorrent::asio::transfer_all(), ec);
if (ec)
{
std::cout << ec.message() << std::endl;
exit(1);
}
asio::write(s, asio::buffer(recv_buffer, 13), asio::transfer_all(), ec);
libtorrent::asio::write(s, libtorrent::asio::buffer(recv_buffer, 13), libtorrent::asio::transfer_all(), ec);
if (ec)
{
std::cout << ec.message() << std::endl;

2
test/test_http_connection.cpp
View File

@@ -118,7 +118,7 @@ void run_suite(std::string const& protocol, proxy_settings const& ps)
if ((ps.type == proxy_settings::http || ps.type == proxy_settings::http_pw) && protocol != "https")
run_test(protocol + "://non-existent-domain.se/non-existing-file", -1, 502, 1, err(), ps);
else
run_test(protocol + "://non-existent-domain.se/non-existing-file", -1, -1, 0, err(asio::error::host_not_found), ps);
run_test(protocol + "://non-existent-domain.se/non-existing-file", -1, -1, 0, err(libtorrent::asio::error::host_not_found), ps);
if (ps.type != proxy_settings::none)
stop_proxy(ps.port);

2
test/test_storage.cpp
View File

@@ -93,7 +93,7 @@ void run_storage_tests(boost::intrusive_ptr<torrent_info> info
// make sure the piece_manager can identify the pieces
{
file_pool fp;
asio::io_service ios;
libtorrent::asio::io_service ios;
disk_io_thread io(ios);
boost::shared_ptr<int> dummy(new int);
boost::intrusive_ptr<piece_manager> pm = new piece_manager(dummy, info