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

attempted windows build fix

This commit is contained in:
Arvid Norberg 2014-02-17 07:24:43 +00:00
parent 2d5f0dddf7
commit 715b60c8ff
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/libtorrent/kademlia/item.hpp
View File

@ -93,14 +93,14 @@ public:
void assign(entry const& v)
{
assign(v, std::pair<char const*, int>(NULL, 0), 0, NULL, NULL);
assign(v, std::pair<char const*, int>(static_cast<char const*>(NULL), 0), 0, NULL, NULL);
}
void assign(entry const& v
, std::pair<char const*, int> salt
, boost::uint64_t seq, char const* pk, char const* sk);
void assign(lazy_entry const* v)
{
assign(v, std::pair<char const*, int>(NULL, 0), 0, NULL, NULL);
assign(v, std::pair<char const*, int>(static_cast<char const*>(NULL), 0), 0, NULL, NULL);
}
bool assign(lazy_entry const* v
, std::pair<char const*, int> salt

2
src/kademlia/node.cpp
View File

@ -938,7 +938,7 @@ void node_impl::incoming_request(msg const& m, entry& e)
return;
}
std::pair<char const*, int> salt(NULL, 0);
std::pair<char const*, int> salt(static_cast<char const*>(NULL), 0);
if (msg_keys[6])
salt = std::pair<char const*, int>(
msg_keys[6]->string_ptr(), msg_keys[6]->string_length());