build fixes

This commit is contained in:
Arvid Norberg 2015-04-26 13:38:56 +00:00
parent 93a19b44c0
commit a15bc13392
5 changed files with 7 additions and 3 deletions

View File

@ -40,12 +40,14 @@ void bind_torrent_status()
&torrent_status::next_announce, return_value_policy<return_by_value>()
)
)
#ifndef TORRENT_NO_DEPRECATE
.add_property(
"announce_interval"
, make_getter(
&torrent_status::announce_interval, return_value_policy<return_by_value>()
)
)
#endif
.def_readonly("current_tracker", &torrent_status::current_tracker)
.def_readonly("total_download", &torrent_status::total_download)
.def_readonly("total_upload", &torrent_status::total_upload)

View File

@ -1,6 +1,8 @@
#include "session_view.hpp"
#include "print.hpp"
#include <algorithm> // for std::max
session_view::session_view()
: m_print_utp_stats(false)
{

View File

@ -1338,7 +1338,7 @@ namespace libtorrent
// the time until the torrent will announce itself to the tracker.
time_duration next_announce;
#ifdef TORRENT_NO_DEPRECATE
#ifndef TORRENT_NO_DEPRECATE
// the time the tracker want us to wait until we announce ourself
// again the next time.
time_duration announce_interval;

View File

@ -249,7 +249,7 @@ void rpc_manager::check_invariant() const
void rpc_manager::unreachable(udp::endpoint const& ep)
{
#ifdef TORRENT_DHT_VERBOSE_LOGGING
TORRENT_LOG(rpc) << aux::time_now_string() << " PORT_UNREACHABLE [ ip: " << ep << " ]";
TORRENT_LOG(rpc) << " PORT_UNREACHABLE [ ip: " << ep << " ]";
#endif
for (transactions_t::iterator i = m_transactions.begin();

View File

@ -11439,7 +11439,7 @@ namespace libtorrent
if (st->next_announce.count() < 0)
st->next_announce = seconds(0);
#ifdef TORRENT_NO_DEPRECATE
#ifndef TORRENT_NO_DEPRECATE
st->announce_interval = seconds(0);
#endif