premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2027 from arvidn/RC_1_1 

merged RC_1_1 into master
This commit is contained in:
Arvid Norberg 2017-05-24 23:30:24 -04:00 committed by GitHub
parent 40cfceb994 432131e493
commit b60b3f164b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/enum_net.cpp
View File

@ -433,10 +433,9 @@ namespace libtorrent {
{
TORRENT_UNUSED(ios); // this may be unused depending on configuration
std::vector<ip_interface> ret;
ec.clear();
#if defined TORRENT_BUILD_SIMULATOR
TORRENT_UNUSED(ec);
std::vector<address> ips = ios.get_ips();
for (auto const& ip : ips)
@ -879,7 +878,8 @@ namespace libtorrent {
{
rtm = reinterpret_cast<rt_msghdr*>(next);
if (rtm->rtm_version != RTM_VERSION
|| rtm->rtm_type != RTM_ADD)
|| (rtm->rtm_type != RTM_ADD
&& rtm->rtm_type != RTM_GET))
{
continue;
}