fix master build

bindings/python/src/datetime.cpp

@@ -60,10 +60,10 @@ struct time_duration_to_python
 
 template <typename Tag> struct tag {};
 
-lt::time_point now(tag<lt::time_point>)
+lt::time_point now(::tag<lt::time_point>)
 { return lt::clock_type::now(); }
 
-lt::time_point32 now(tag<lt::time_point32>)
+lt::time_point32 now(::tag<lt::time_point32>)
 { return lt::time_point_cast<lt::seconds32>(lt::clock_type::now()); }
 
 template <typename T>
@@ -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<system_clock::duration>(pt - now(tag<T>())));
+              + duration_cast<system_clock::duration>(pt - now(::tag<T>())));
 
            std::tm* date = std::localtime(&tm);
            result = datetime_datetime(

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)

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