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

fix some warnings

This commit is contained in:
arvidn 2015-08-18 09:33:00 -04:00
parent 8d8c049d9e
commit 12da02ae52
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/disk_io_thread.cpp
View File

@ -89,7 +89,7 @@ namespace libtorrent
#else #else
#define TORRENT_PIECE_ASSERT(cond, piece) do {} TORRENT_WHILE_0 #define TORRENT_PIECE_ASSERT(cond, piece) do {} TORRENT_WHILE_0
#endif #endif // TORRENT_USE_ASSERTS
namespace { namespace {

10
src/enum_net.cpp
View File

@ -124,11 +124,11 @@ namespace libtorrent { namespace
address sockaddr_to_address(sockaddr const* sin, int assume_family = -1) address sockaddr_to_address(sockaddr const* sin, int assume_family = -1)
{ {
if (sin->sa_family == AF_INET || assume_family == AF_INET) if (sin->sa_family == AF_INET || assume_family == AF_INET)
return inaddr_to_address(&((sockaddr_in const*)sin)->sin_addr return inaddr_to_address(&reinterpret_cast<sockaddr_in const*>(sin)->sin_addr
, sockaddr_len(sin) - offsetof(sockaddr, sa_data)); , sockaddr_len(sin) - offsetof(sockaddr, sa_data));
#if TORRENT_USE_IPV6 #if TORRENT_USE_IPV6
else if (sin->sa_family == AF_INET6 || assume_family == AF_INET6) else if (sin->sa_family == AF_INET6 || assume_family == AF_INET6)
return inaddr6_to_address(&((sockaddr_in6 const*)sin)->sin6_addr return inaddr6_to_address(&reinterpret_cast<sockaddr_in6 const*>(sin)->sin6_addr
, sockaddr_len(sin) - offsetof(sockaddr, sa_data)); , sockaddr_len(sin) - offsetof(sockaddr, sa_data));
#endif #endif
return address(); return address();
@ -230,7 +230,7 @@ int _System __libsocket_sysctl(int* mib, u_int namelen, void *oldp, size_t *oldl
bool parse_route(int s, rt_msghdr* rtm, ip_route* rt_info) bool parse_route(int s, rt_msghdr* rtm, ip_route* rt_info)
{ {
sockaddr* rti_info[RTAX_MAX]; sockaddr* rti_info[RTAX_MAX];
sockaddr* sa = (sockaddr*)(rtm + 1); sockaddr* sa = reinterpret_cast<sockaddr*>(rtm + 1);
for (int i = 0; i < RTAX_MAX; ++i) for (int i = 0; i < RTAX_MAX; ++i)
{ {
if ((rtm->rtm_addrs & (1 << i)) == 0) if ((rtm->rtm_addrs & (1 << i)) == 0)
@ -243,7 +243,7 @@ int _System __libsocket_sysctl(int* mib, u_int namelen, void *oldp, size_t *oldl
#define ROUNDUP(a) \ #define ROUNDUP(a) \
((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
sa = (sockaddr*)((char*)(sa) + ROUNDUP(sa->sa_len)); sa = reinterpret_cast<sockaddr*>(reinterpret_cast<char*>(sa) + ROUNDUP(sa->sa_len));
#undef ROUNDUP #undef ROUNDUP
} }
@ -850,7 +850,7 @@ namespace libtorrent
rt_msghdr* rtm; rt_msghdr* rtm;
for (char* next = buf.get(); next < end; next += rtm->rtm_msglen) for (char* next = buf.get(); next < end; next += rtm->rtm_msglen)
{ {
rtm = (rt_msghdr*)next; rtm = reinterpret_cast<rt_msghdr*>(next);
if (rtm->rtm_version != RTM_VERSION) if (rtm->rtm_version != RTM_VERSION)
continue; continue;

2
src/peer_class_set.cpp
View File

@ -43,7 +43,7 @@ namespace libtorrent
!= m_class.begin() + m_size) return; != m_class.begin() + m_size) return;
if (m_size >= m_class.size() - 1) if (m_size >= m_class.size() - 1)
{ {
assert(false); TORRENT_ASSERT(false);
return; return;
} }
m_class[m_size] = c; m_class[m_size] = c;