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

merge fix

This commit is contained in:
arvidn 2016-07-20 11:48:44 -07:00
parent e405f0e02f
commit b8bfc13d59
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/kademlia/get_item.cpp
View File

@ -78,7 +78,7 @@ void get_item::got_data(bdecode_node const& v,
// data can reach here, which means pk and sig must be valid.
if (!pk || !sig) return;
std::string temp_copy(m_data.salt());
std::string temp_copy(m_data.salt());
std::pair<char const*, int> salt(temp_copy.c_str(), int(temp_copy.size()));
sha1_hash incoming_target = item_target_id(salt, pk);
if (incoming_target != m_target) return;

6
test/test_ip_filter.cpp
View File

@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/ip_filter.hpp"
#include "setup_transfer.hpp" // for addr()
#include <boost/utility.hpp>
#include <utility>
#include "test.hpp"
#include "libtorrent/socket_io.hpp"
@ -78,7 +78,7 @@ void test_rules_invariant(std::vector<ip_range<T> > const& r, ip_filter const& f
TEST_CHECK(r.back().last == addr("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"));
}
for (iterator i(r.begin()), j(boost::next(r.begin()))
for (iterator i(r.begin()), j(std::next(r.begin()))
, end(r.end()); j != end; ++j, ++i)
{
TEST_EQUAL(f.access(i->last), int(i->flags));
@ -93,7 +93,7 @@ TORRENT_TEST(session_get_ip_filter)
session ses;
ip_filter const& ipf = ses.get_ip_filter();
#if TORRENT_USE_IPV6
TEST_EQUAL(boost::get<0>(ipf.export_filter()).size(), 1);
TEST_EQUAL(std::get<0>(ipf.export_filter()).size(), 1);
#else
TEST_EQUAL(ipf.export_filter().size(), 1);
#endif