From bf2e4df2b26434f7564cea1911e04635bb963192 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Sun, 7 Aug 2011 23:40:39 +0000 Subject: [PATCH] fix build with std::tr1::array instead of boost::array --- src/broadcast_socket.cpp | 8 ++++---- src/bt_peer_connection.cpp | 4 ++-- src/http_tracker_connection.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/broadcast_socket.cpp b/src/broadcast_socket.cpp index d62bb459a..b23e48ce4 100644 --- a/src/broadcast_socket.cpp +++ b/src/broadcast_socket.cpp @@ -195,8 +195,8 @@ namespace libtorrent // both are v4 address_v4::bytes_type b1 = a1.to_v4().to_bytes(); address_v4::bytes_type b2 = a2.to_v4().to_bytes(); - return address_v4::bytes_type::static_size * 8 - - common_bits(b1.c_array(), b2.c_array(), b1.size()); + return address_v4::bytes_type().size() * 8 + - common_bits(b1.data(), b2.data(), b1.size()); #if TORRENT_USE_IPV6 } @@ -206,8 +206,8 @@ namespace libtorrent else b1 = a1.to_v6().to_bytes(); if (a2.is_v4()) b2 = address_v6::v4_mapped(a2.to_v4()).to_bytes(); else b2 = a2.to_v6().to_bytes(); - return address_v6::bytes_type::static_size * 8 - - common_bits(b1.c_array(), b2.c_array(), b1.size()); + return address_v6::bytes_type().size() * 8 + - common_bits(b1.data(), b2.data(), b1.size()); #endif } diff --git a/src/bt_peer_connection.cpp b/src/bt_peer_connection.cpp index ad590dd99..42e2aee9e 100644 --- a/src/bt_peer_connection.cpp +++ b/src/bt_peer_connection.cpp @@ -1763,7 +1763,7 @@ namespace libtorrent if (!myip.empty()) { // TODO: don't trust this blindly - if (myip.size() == address_v4::bytes_type::static_size) + if (myip.size() == address_v4::bytes_type().size()) { address_v4::bytes_type bytes; std::copy(myip.begin(), myip.end(), bytes.begin()); @@ -1771,7 +1771,7 @@ namespace libtorrent , aux::session_impl::source_peer, remote().address()); } #if TORRENT_USE_IPV6 - else if (myip.size() == address_v6::bytes_type::static_size) + else if (myip.size() == address_v6::bytes_type().size()) { address_v6::bytes_type bytes; std::copy(myip.begin(), myip.end(), bytes.begin()); diff --git a/src/http_tracker_connection.cpp b/src/http_tracker_connection.cpp index 59cadc53d..a6fe5189e 100644 --- a/src/http_tracker_connection.cpp +++ b/src/http_tracker_connection.cpp @@ -508,10 +508,10 @@ namespace libtorrent if (ip_ent) { char const* p = ip_ent->string_ptr(); - if (ip_ent->string_length() == address_v4::bytes_type::static_size) + if (ip_ent->string_length() == address_v4::bytes_type().size()) external_ip = detail::read_v4_address(p); #if TORRENT_USE_IPV6 - else if (ip_ent->string_length() == address_v6::bytes_type::static_size) + else if (ip_ent->string_length() == address_v6::bytes_type().size()) external_ip = detail::read_v6_address(p); #endif }