fix some warnings
This commit is contained in:
@@ -45,6 +45,8 @@ POSSIBILITY OF SUCH DAMAGE.
|
|||||||
#include "libtorrent/thread.hpp"
|
#include "libtorrent/thread.hpp"
|
||||||
#include "libtorrent/time.hpp"
|
#include "libtorrent/time.hpp"
|
||||||
|
|
||||||
|
#include "libtorrent/aux_/disable_warnings_push.hpp"
|
||||||
|
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <deque>
|
#include <deque>
|
||||||
@@ -53,8 +55,12 @@ POSSIBILITY OF SUCH DAMAGE.
|
|||||||
#include <mach/task_info.h>
|
#include <mach/task_info.h>
|
||||||
#include <mach/task.h>
|
#include <mach/task.h>
|
||||||
#include <mach/mach_init.h>
|
#include <mach/mach_init.h>
|
||||||
|
|
||||||
|
const mach_msg_type_number_t task_events_info_count = TASK_EVENTS_INFO_COUNT;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "libtorrent/aux_/disable_warnings_pop.hpp"
|
||||||
|
|
||||||
std::string demangle(char const* name);
|
std::string demangle(char const* name);
|
||||||
|
|
||||||
namespace libtorrent
|
namespace libtorrent
|
||||||
@@ -120,9 +126,9 @@ namespace libtorrent
|
|||||||
w.timestamp = clock_type::now();
|
w.timestamp = clock_type::now();
|
||||||
#ifdef __MACH__
|
#ifdef __MACH__
|
||||||
task_events_info teinfo;
|
task_events_info teinfo;
|
||||||
mach_msg_type_number_t t_info_count = TASK_EVENTS_INFO_COUNT;
|
mach_msg_type_number_t t_info_count = task_events_info_count;
|
||||||
task_info(mach_task_self(), TASK_EVENTS_INFO, (task_info_t)&teinfo
|
task_info(mach_task_self(), TASK_EVENTS_INFO,
|
||||||
, &t_info_count);
|
reinterpret_cast<task_info_t>(&teinfo), &t_info_count);
|
||||||
w.context_switches = teinfo.csw;
|
w.context_switches = teinfo.csw;
|
||||||
#else
|
#else
|
||||||
w.context_switches = 0;
|
w.context_switches = 0;
|
||||||
|
@@ -152,7 +152,6 @@ namespace libtorrent { namespace dht
|
|||||||
deadline_timer m_connection_timer;
|
deadline_timer m_connection_timer;
|
||||||
deadline_timer m_refresh_timer;
|
deadline_timer m_refresh_timer;
|
||||||
dht_settings const& m_settings;
|
dht_settings const& m_settings;
|
||||||
int m_refresh_bucket;
|
|
||||||
|
|
||||||
bool m_abort;
|
bool m_abort;
|
||||||
|
|
||||||
|
Submodule simulation/libsimulator updated: dc868f86ca...48c4dd76d7
@@ -108,7 +108,6 @@ namespace libtorrent { namespace dht
|
|||||||
, m_connection_timer(sock.get_io_service())
|
, m_connection_timer(sock.get_io_service())
|
||||||
, m_refresh_timer(sock.get_io_service())
|
, m_refresh_timer(sock.get_io_service())
|
||||||
, m_settings(settings)
|
, m_settings(settings)
|
||||||
, m_refresh_bucket(160)
|
|
||||||
, m_abort(false)
|
, m_abort(false)
|
||||||
, m_host_resolver(sock.get_io_service())
|
, m_host_resolver(sock.get_io_service())
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user