wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

fixed some msvc warnings

This commit is contained in:
Arvid Norberg 2009-10-26 02:26:15 +00:00
parent 45ce870189
commit c777227c84
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/libtorrent/stat.hpp
View File

@ -82,7 +82,7 @@ namespace libtorrent
// should be called once every second
void second_tick(int tick_interval_ms);
int rate() const { return m_rate_sum / history; }
int rate() const { return int(m_rate_sum / history); }
size_type rate_sum() const { return m_rate_sum; }
size_type total() const { return m_total_counter; }
@ -94,7 +94,7 @@ namespace libtorrent
TORRENT_ASSERT(m_total_counter >= 0);
}
size_type counter() const { return m_counter; }
int counter() const { return m_counter; }
void clear()
{
@ -225,20 +225,20 @@ namespace libtorrent
int upload_rate() const
{
return (m_stat[upload_payload].rate_sum()
return int((m_stat[upload_payload].rate_sum()
+ m_stat[upload_protocol].rate_sum()
+ m_stat[upload_ip_protocol].rate_sum()
+ m_stat[upload_dht_protocol].rate_sum())
/ stat_channel::history;
/ stat_channel::history);
}
int download_rate() const
{
return (m_stat[download_payload].rate_sum()
return int((m_stat[download_payload].rate_sum()
+ m_stat[download_protocol].rate_sum()
+ m_stat[download_ip_protocol].rate_sum()
+ m_stat[download_dht_protocol].rate_sum())
/ stat_channel::history;
/ stat_channel::history);
}
size_type total_upload() const
@ -288,13 +288,13 @@ namespace libtorrent
m_stat[upload_payload].offset(uploaded);
}
size_type last_payload_downloaded() const
int last_payload_downloaded() const
{ return m_stat[download_payload].counter(); }
size_type last_payload_uploaded() const
int last_payload_uploaded() const
{ return m_stat[upload_payload].counter(); }
size_type last_protocol_downloaded() const
int last_protocol_downloaded() const
{ return m_stat[download_protocol].counter(); }
size_type last_protocol_uploaded() const
int last_protocol_uploaded() const
{ return m_stat[upload_protocol].counter(); }
// these are the channels we keep stats for

2
src/stat.cpp
View File

@ -55,7 +55,7 @@ void stat_channel::second_tick(int tick_interval_ms)
for (int i = history - 2; i >= 0; --i)
m_rate_history[i + 1] = m_rate_history[i];
m_rate_history[0] = size_type(m_counter) * 1000 / tick_interval_ms;
m_rate_history[0] = int(size_type(m_counter) * 1000 / tick_interval_ms);
TORRENT_ASSERT(m_rate_history[0] >= 0);
m_rate_sum += m_rate_history[0];
m_counter = 0;