use a better windows.foundation.collections.h(462) conflict fix

This commit is contained in:
John Sebastian Peterson 2015-07-04 04:33:17 +02:00
parent 30142e35ac
commit bb25acd661
1 changed files with 3 additions and 2 deletions

View File

@ -63,6 +63,7 @@ using libtorrent::dht::node;
using libtorrent::dht::node_id; using libtorrent::dht::node_id;
using libtorrent::dht::packet_t; using libtorrent::dht::packet_t;
using libtorrent::dht::msg; using libtorrent::dht::msg;
using libtorrent::detail::write_endpoint;
enum enum
{ {
@ -392,7 +393,7 @@ namespace libtorrent { namespace dht
entry* n = (entry*)userdata; entry* n = (entry*)userdata;
std::string node; std::string node;
std::back_insert_iterator<std::string> out(node); std::back_insert_iterator<std::string> out(node);
libtorrent::detail::write_endpoint(e.ep(), out); write_endpoint(e.ep(), out);
n->list().push_back(entry(node)); n->list().push_back(entry(node));
} }
@ -411,7 +412,7 @@ namespace libtorrent { namespace dht
{ {
std::string node; std::string node;
std::back_insert_iterator<std::string> out(node); std::back_insert_iterator<std::string> out(node);
libtorrent::detail::write_endpoint(i->ep(), out); write_endpoint(i->ep(), out);
nodes.list().push_back(entry(node)); nodes.list().push_back(entry(node));
} }
if (!nodes.list().empty()) if (!nodes.list().empty())