From 21c9a493f6b995a560b190e59d4ca5311c115588 Mon Sep 17 00:00:00 2001 From: arvidn Date: Sun, 12 Feb 2017 03:03:58 -0500 Subject: [PATCH] fix master build --- bindings/python/src/datetime.cpp | 6 +++--- bindings/python/src/torrent_info.cpp | 3 +-- include/libtorrent/settings_pack.hpp | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/bindings/python/src/datetime.cpp b/bindings/python/src/datetime.cpp index 10d85cf6f..beead26cb 100644 --- a/bindings/python/src/datetime.cpp +++ b/bindings/python/src/datetime.cpp @@ -60,10 +60,10 @@ struct time_duration_to_python template struct tag {}; -lt::time_point now(tag) +lt::time_point now(::tag) { return lt::clock_type::now(); } -lt::time_point32 now(tag) +lt::time_point32 now(::tag) { return lt::time_point_cast(lt::clock_type::now()); } template @@ -77,7 +77,7 @@ struct time_point_to_python if (pt > T()) { time_t const tm = system_clock::to_time_t(system_clock::now() - + duration_cast(pt - now(tag()))); + + duration_cast(pt - now(::tag()))); std::tm* date = std::localtime(&tm); result = datetime_datetime( diff --git a/bindings/python/src/torrent_info.cpp b/bindings/python/src/torrent_info.cpp index e12eaad4e..bda8077f4 100644 --- a/bindings/python/src/torrent_info.cpp +++ b/bindings/python/src/torrent_info.cpp @@ -330,10 +330,9 @@ void bind_torrent_info() .add_property("complete_sent", &get_complete_sent) #if !defined TORRENT_NO_DEPRECATE .add_property("send_stats", &get_send_stats) -#endif - .def("next_announce_in", &announce_entry::next_announce_in) .def("min_announce_in", &announce_entry::min_announce_in) +#endif .def("reset", &announce_entry::reset) .def("can_announce", can_announce) .def("is_working", &announce_entry::is_working) diff --git a/include/libtorrent/settings_pack.hpp b/include/libtorrent/settings_pack.hpp index 617ec3675..adce55ed5 100644 --- a/include/libtorrent/settings_pack.hpp +++ b/include/libtorrent/settings_pack.hpp @@ -810,10 +810,10 @@ namespace libtorrent // time to wait until a new retry of a web seed takes place urlseed_wait_retry, - + // time to wait until a new retry of a web seed name lookup web_seed_name_lookup_retry, - + // sets the upper limit on the total number of files this session will // keep open. The reason why files are left open at all is that some // anti virus software hooks on every file close, and scans the file