forked from premiere/premiere-libtorrent
attempt to fix build
This commit is contained in:
parent
6c67694d22
commit
74ca290fe6
|
@ -449,7 +449,7 @@ namespace libtorrent
|
||||||
return url.substr(pos, url.find('&', pos) - pos);
|
return url.substr(pos, url.find('&', pos) - pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
TORRENT_EXTRA_EXPORT std::string to_hex(std::string const& s)
|
TORRENT_EXPORT std::string to_hex(std::string const& s)
|
||||||
{
|
{
|
||||||
std::string ret;
|
std::string ret;
|
||||||
for (std::string::const_iterator i = s.begin(); i != s.end(); ++i)
|
for (std::string::const_iterator i = s.begin(); i != s.end(); ++i)
|
||||||
|
@ -460,7 +460,7 @@ namespace libtorrent
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
TORRENT_EXTRA_EXPORT void to_hex(char const *in, int len, char* out)
|
TORRENT_EXPORT void to_hex(char const *in, int len, char* out)
|
||||||
{
|
{
|
||||||
for (char const* end = in + len; in < end; ++in)
|
for (char const* end = in + len; in < end; ++in)
|
||||||
{
|
{
|
||||||
|
@ -488,7 +488,7 @@ namespace libtorrent
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
TORRENT_EXTRA_EXPORT bool from_hex(char const *in, int len, char* out)
|
TORRENT_EXPORT bool from_hex(char const *in, int len, char* out)
|
||||||
{
|
{
|
||||||
for (char const* end = in + len; in < end; ++in, ++out)
|
for (char const* end = in + len; in < end; ++in, ++out)
|
||||||
{
|
{
|
||||||
|
|
|
@ -145,10 +145,10 @@ std::map<std::string, boost::uint64_t> get_counters(libtorrent::session& s)
|
||||||
std::auto_ptr<alert> wait_for_alert(lt::session& ses, int type, char const* name)
|
std::auto_ptr<alert> wait_for_alert(lt::session& ses, int type, char const* name)
|
||||||
{
|
{
|
||||||
std::auto_ptr<alert> ret;
|
std::auto_ptr<alert> ret;
|
||||||
time_point end = aux::time_now() + seconds(10);
|
time_point end = libtorrent::clock_type::now() + seconds(10);
|
||||||
while (!ret.get())
|
while (!ret.get())
|
||||||
{
|
{
|
||||||
time_point now = aux::time_now();
|
time_point now = clock_type::now();
|
||||||
if (now > end) return std::auto_ptr<alert>();
|
if (now > end) return std::auto_ptr<alert>();
|
||||||
|
|
||||||
ses.wait_for_alert(end - now);
|
ses.wait_for_alert(end - now);
|
||||||
|
|
Loading…
Reference in New Issue