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

fix warnings in alert_manager and fix test_resolve_links for windows

Browse Source
This commit is contained in:
Arvid Norberg
2015-04-04 19:11:14 +00:00
parent d019f3d4c3
commit 2a3a34bf8d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/libtorrent/alert_manager.hpp
View File

@@ -136,8 +136,8 @@ namespace libtorrent {
return m_alert_mask;
}
size_t alert_queue_size_limit() const { return m_queue_size_limit; }
size_t set_alert_queue_size_limit(size_t queue_size_limit_);
int alert_queue_size_limit() const { return m_queue_size_limit; }
int set_alert_queue_size_limit(int queue_size_limit_);
void set_notify_function(boost::function<void()> const& fun);
@@ -162,7 +162,7 @@ namespace libtorrent {
mutable mutex m_mutex;
condition_variable m_condition;
boost::uint32_t m_alert_mask;
size_t m_queue_size_limit;
int m_queue_size_limit;
#ifndef TORRENT_NO_DEPRECATE
bool maybe_dispatch(alert const& a);

2
src/alert_manager.cpp
View File

@@ -168,7 +168,7 @@ namespace libtorrent
return !m_alerts[m_generation].empty();
}
size_t alert_manager::set_alert_queue_size_limit(size_t queue_size_limit_)
int alert_manager::set_alert_queue_size_limit(int queue_size_limit_)
{
mutex::scoped_lock lock(m_mutex);

4
test/test_resolve_links.cpp
View File

@@ -87,8 +87,8 @@ int test_main()
{
#ifndef TORRENT_DISABLE_MUTABLE_TORRENTS
std::string path
= combine_path("..", "mutable_test_torrents");
std::string path = combine_path(parent_path(current_working_directory())
, "mutable_test_torrents");
for (int i = 0; i < sizeof(test_torrents)/sizeof(test_torrents[0]); ++i)
{