fixed windows build and removed msvc warnings

This commit is contained in:
Arvid Norberg
2008-02-25 10:28:53 +00:00
parent a20a8d2522
commit a25c25b02a
12 changed files with 28 additions and 22 deletions

View File

@@ -139,6 +139,8 @@ struct bandwidth_manager
void close()
{
m_abort = true;
m_queue.clear();
m_history.clear();
m_history_timer.cancel();
}
@@ -192,6 +194,7 @@ struct bandwidth_manager
{
mutex_t::scoped_lock l(m_mutex);
INVARIANT_CHECK;
if (m_abort) return;
TORRENT_ASSERT(blk > 0);
TORRENT_ASSERT(!is_queued(peer.get(), l));
TORRENT_ASSERT(!peer->ignore_bandwidth_limits());

View File

@@ -57,7 +57,7 @@ namespace libtorrent
{
struct http_connection;
struct connection_queue;
class connection_queue;
typedef boost::function<void(asio::error_code const&
, http_parser const&, char const* data, int size)> http_handler;

View File

@@ -198,7 +198,7 @@ namespace libtorrent
const std::vector<announce_entry>& trackers() const { return m_urls; }
size_type total_size() const { TORRENT_ASSERT(m_piece_length > 0); return m_total_size; }
size_type piece_length() const { TORRENT_ASSERT(m_piece_length > 0); return m_piece_length; }
int piece_length() const { TORRENT_ASSERT(m_piece_length > 0); return m_piece_length; }
int num_pieces() const { TORRENT_ASSERT(m_piece_length > 0); return m_num_pieces; }
const sha1_hash& info_hash() const { return m_info_hash; }
const std::string& name() const { TORRENT_ASSERT(m_piece_length > 0); return m_name; }
@@ -215,7 +215,7 @@ namespace libtorrent
void convert_file_names();
size_type piece_size(int index) const;
int piece_size(int index) const;
const sha1_hash& hash_for_piece(int index) const
{
@@ -267,7 +267,7 @@ namespace libtorrent
// the length of one piece
// if this is 0, the torrent_info is
// in an uninitialized state
size_type m_piece_length;
int m_piece_length;
// the sha-1 hashes of each piece
std::vector<sha1_hash> m_piece_hash;