forked from premiere/premiere-libtorrent
merged boost.system fix from RC_0_16
This commit is contained in:
parent
15ecec3ae5
commit
330aac4acb
|
@ -3,6 +3,7 @@
|
|||
* fix uTP edge case where udp socket buffer fills up
|
||||
* fix nagle implementation in uTP
|
||||
|
||||
* update use of boost.system to not use deprecated functions
|
||||
* fix GIL issue in python bindings. Deprecated extension support in python
|
||||
* fixed bug where setting upload slots to -1 would not mean infinite
|
||||
* extend the UDP tracker protocol to include the request string from the tracker URL
|
||||
|
|
|
@ -107,12 +107,13 @@ namespace libtorrent
|
|||
|
||||
#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
|
||||
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include "libtorrent/config.hpp"
|
||||
#include "libtorrent/file.hpp"
|
||||
#include "libtorrent/thread.hpp"
|
||||
|
||||
#if TORRENT_USE_IOSTREAM
|
||||
#include <string>
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
#endif
|
||||
|
|
|
@ -364,13 +364,22 @@ namespace libtorrent
|
|||
}
|
||||
|
||||
using boost::system::error_code;
|
||||
|
||||
#if BOOST_VERSION < 104400
|
||||
inline boost::system::error_category const& get_system_category()
|
||||
{ return boost::system::get_system_category(); }
|
||||
#else
|
||||
inline boost::system::error_category const& get_system_category()
|
||||
{ return boost::system::system_category(); }
|
||||
#endif
|
||||
|
||||
inline boost::system::error_category const& get_posix_category()
|
||||
#if BOOST_VERSION < 103600
|
||||
{ return boost::system::get_posix_category(); }
|
||||
#else
|
||||
#elif BOOST_VERSION < 104400
|
||||
{ return boost::system::get_generic_category(); }
|
||||
#else
|
||||
{ return boost::system::generic_category(); }
|
||||
#endif // BOOST_VERSION < 103600
|
||||
#endif // BOOST_VERSION < 103500
|
||||
|
||||
|
|
Loading…
Reference in New Issue