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

fixed msvc build

This commit is contained in:
Arvid Norberg 2009-10-04 23:46:29 +00:00
parent 599543e889
commit 115a4b1863
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/libtorrent/peer_id.hpp
View File

@ -47,6 +47,14 @@ POSSIBILITY OF SUCH DAMAGE.
#include <iomanip> #include <iomanip>
#endif #endif
#ifdef max
#undef max
#endif
#ifdef min
#undef min
#endif
namespace libtorrent namespace libtorrent
{ {

18
src/kademlia/node.cpp
View File

@ -67,10 +67,10 @@ int search_torrent_entry::match(char const* in_tags[], int num_tags) const
for (int i = 0; i < num_tags; ++i) for (int i = 0; i < num_tags; ++i)
{ {
char const* t = in_tags[i]; char const* t = in_tags[i];
std::map<std::string, int>::const_iterator i = tags.find(t); std::map<std::string, int>::const_iterator j = tags.find(t);
if (i == tags.end()) continue; if (j == tags.end()) continue;
// weigh the score by how popular this tag is in this torrent // weigh the score by how popular this tag is in this torrent
ret += 100 * i->second / total_tag_points; ret += 100 * j->second / total_tag_points;
} }
return ret; return ret;
} }
@ -108,9 +108,9 @@ void search_torrent_entry::publish(std::string const& torrent_name, char const*
for (int i = 0; i < num_tags; ++i) for (int i = 0; i < num_tags; ++i)
{ {
char const* t = in_tags[i]; char const* t = in_tags[i];
std::map<std::string, int>::iterator i = tags.find(t); std::map<std::string, int>::iterator j = tags.find(t);
if (i != tags.end()) if (j != tags.end())
++i->second; ++j->second;
else else
tags[t] = 1; tags[t] = 1;
++total_tag_points; ++total_tag_points;
@ -534,8 +534,8 @@ bool node_impl::lookup_torrents(sha1_hash const& target
// m_ses.m_alerts.post_alert(dht_find_torrents_alert(info_hash)); // m_ses.m_alerts.post_alert(dht_find_torrents_alert(info_hash));
search_table_t::const_iterator first, last; search_table_t::const_iterator first, last;
first = m_search_map.lower_bound(std::make_pair(target, sha1_hash::min())); first = m_search_map.lower_bound(std::make_pair(target, (sha1_hash::min)()));
last = m_search_map.upper_bound(std::make_pair(target, sha1_hash::max())); last = m_search_map.upper_bound(std::make_pair(target, (sha1_hash::max)()));
if (first == last) return false; if (first == last) return false;
@ -587,7 +587,7 @@ bool node_impl::lookup_peers(sha1_hash const& info_hash, entry& reply) const
int num = (std::min)((int)v.peers.size(), m_settings.max_peers_reply); int num = (std::min)((int)v.peers.size(), m_settings.max_peers_reply);
int t = 0; int t = 0;
int m = 0; int m = 0;
std::set<peer_entry>::iterator iter = v.peers.begin(); std::set<peer_entry>::const_iterator iter = v.peers.begin();
entry::list_type& pe = reply["values"].list(); entry::list_type& pe = reply["values"].list();
std::string endpoint; std::string endpoint;