fix some warnings

This commit is contained in:
arvidn 2015-08-19 02:00:46 +02:00
parent 6bcac425f1
commit a3608a39fe
4 changed files with 10 additions and 6 deletions

View File

@ -45,6 +45,8 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/thread.hpp"
#include "libtorrent/time.hpp"
#include "libtorrent/aux_/disable_warnings_push.hpp"
#include <map>
#include <cstring>
#include <deque>
@ -53,8 +55,12 @@ POSSIBILITY OF SUCH DAMAGE.
#include <mach/task_info.h>
#include <mach/task.h>
#include <mach/mach_init.h>
const mach_msg_type_number_t task_events_info_count = TASK_EVENTS_INFO_COUNT;
#endif
#include "libtorrent/aux_/disable_warnings_pop.hpp"
std::string demangle(char const* name);
namespace libtorrent
@ -120,9 +126,9 @@ namespace libtorrent
w.timestamp = clock_type::now();
#ifdef __MACH__
task_events_info teinfo;
mach_msg_type_number_t t_info_count = TASK_EVENTS_INFO_COUNT;
task_info(mach_task_self(), TASK_EVENTS_INFO, (task_info_t)&teinfo
, &t_info_count);
mach_msg_type_number_t t_info_count = task_events_info_count;
task_info(mach_task_self(), TASK_EVENTS_INFO,
reinterpret_cast<task_info_t>(&teinfo), &t_info_count);
w.context_switches = teinfo.csw;
#else
w.context_switches = 0;

View File

@ -152,7 +152,6 @@ namespace libtorrent { namespace dht
deadline_timer m_connection_timer;
deadline_timer m_refresh_timer;
dht_settings const& m_settings;
int m_refresh_bucket;
bool m_abort;

@ -1 +1 @@
Subproject commit dc868f86caa44fdb3fcf41e99b881a916a457781
Subproject commit 48c4dd76d728d153ea183dc1cfeeff4ac0f8d7d7

View File

@ -108,7 +108,6 @@ namespace libtorrent { namespace dht
, m_connection_timer(sock.get_io_service())
, m_refresh_timer(sock.get_io_service())
, m_settings(settings)
, m_refresh_bucket(160)
, m_abort(false)
, m_host_resolver(sock.get_io_service())
{