deprecate announce_entry::will_announce

This commit is contained in:
Arvid Norberg 2013-11-28 08:44:31 +00:00
parent fb555cb558
commit 54d5222347
2 changed files with 5 additions and 2 deletions

View File

@ -2300,7 +2300,6 @@ int main(int argc, char* argv[])
snprintf(str, sizeof(str), "%2d %-55s fails: %-3d (%-3d) %s %s %5d \"%s\" %s\n" snprintf(str, sizeof(str), "%2d %-55s fails: %-3d (%-3d) %s %s %5d \"%s\" %s\n"
, i->tier, i->url.c_str(), i->fails, i->fail_limit, i->verified?"OK ":"- " , i->tier, i->url.c_str(), i->fails, i->fail_limit, i->verified?"OK ":"- "
, i->updating?"updating" , i->updating?"updating"
:!i->will_announce(now)?""
:to_string(int(total_seconds(i->next_announce - now)), 8).c_str() :to_string(int(total_seconds(i->next_announce - now)), 8).c_str()
, i->min_announce > now ? total_seconds(i->min_announce - now) : 0 , i->min_announce > now ? total_seconds(i->min_announce - now) : 0
, i->last_error ? i->last_error.message().c_str() : "" , i->last_error ? i->last_error.message().c_str() : ""

View File

@ -195,12 +195,16 @@ namespace libtorrent
// This is called when the tracker announce fails. // This is called when the tracker announce fails.
void failed(session_settings const& sett, int retry_interval = 0); void failed(session_settings const& sett, int retry_interval = 0);
bool will_announce(ptime now) const #ifndef TORRENT_NO_DEPRECATE
// deprecated in 1.0
TORRENT_DEPRECATED_PREFIX
bool will_announce(ptime now) const TORRENT_DEPRECATED
{ {
return now <= next_announce return now <= next_announce
&& (fails < fail_limit || fail_limit == 0) && (fails < fail_limit || fail_limit == 0)
&& !updating; && !updating;
} }
#endif
// returns true if we can announec to this tracker now. // returns true if we can announec to this tracker now.
// The current time is passed in as ``now``. The ``is_seed`` // The current time is passed in as ``now``. The ``is_seed``