premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

merge RC_1_1 into master

This commit is contained in:
arvidn 2017-12-27 22:16:14 +01:00
parent c1abafc0cc 69ff30f50f
commit a9753d3bdc
7 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -82,6 +82,7 @@
* resume data no longer has timestamps of files
* require C++11 to build libtorrent
* deprecate save_encryption_settings (they are part of the normal settings)
* add getters for peer_class_filter and peer_class_type_filter
* make torrent_handler::set_priority() to use peer_classes
* fix support for boost-1.66 (requires C++11)

2
bindings/python/src/session.cpp
View File

@ -1073,8 +1073,8 @@ void bind_session()
s.attr("save_settings") = lt::session::save_settings;
s.attr("save_dht_settings") = lt::session::save_dht_settings;
s.attr("save_dht_state") = lt::session::save_dht_state;
s.attr("save_encryption_settings") = lt::session:: save_encryption_settings;
#ifndef TORRENT_NO_DEPRECATE
s.attr("save_encryption_settings") = lt::session:: save_encryption_settings;
s.attr("save_as_map") = lt::session::save_as_map;
s.attr("save_i2p_proxy") = lt::session::save_i2p_proxy;
s.attr("save_proxy") = lt::session::save_proxy;

1
bindings/python/src/torrent_handle.cpp
View File

@ -13,7 +13,6 @@
#include "libtorrent/announce_entry.hpp"
#include <libtorrent/storage.hpp>
#include <libtorrent/disk_interface.hpp>
#include <boost/lexical_cast.hpp>
#include "gil.hpp"
using namespace boost::python;

2
docs/building.rst
View File

@ -405,7 +405,7 @@ unix/linux systems comes with these preinstalled.
The prerequisites for building libtorrent are boost.system, boost.chrono and
boost.random. Those are the *compiled* boost libraries needed. The headers-only
libraries needed include (but is not necessarily limited to) boost.bind,
boost.ref, boost.multi_index, boost.optional, boost.lexical_cast, boost.integer,
boost.ref, boost.multi_index, boost.optional, boost.integer,
boost.iterator, boost.tuple, boost.array, boost.function, boost.smart_ptr,
boost.preprocessor, boost.static_assert.

5
include/libtorrent/session_handle.hpp
View File

@ -95,10 +95,9 @@ namespace libtorrent {
// joining the DHT if provided at next session startup.
static constexpr save_state_flags_t save_dht_state = 2_bit;
// save pe_settings
static constexpr save_state_flags_t save_encryption_settings = 3_bit;
#ifndef TORRENT_NO_DEPRECATE
// save pe_settings
static constexpr save_state_flags_t TORRENT_DEPRECATED_MEMBER save_encryption_settings = 3_bit;
static constexpr save_state_flags_t TORRENT_DEPRECATED_MEMBER save_as_map = 4_bit;
static constexpr save_state_flags_t TORRENT_DEPRECATED_MEMBER save_proxy = 5_bit;
static constexpr save_state_flags_t TORRENT_DEPRECATED_MEMBER save_i2p_proxy = 6_bit;

2
src/session_handle.cpp
View File

@ -55,8 +55,8 @@ namespace libtorrent {
constexpr save_state_flags_t session_handle::save_settings;
constexpr save_state_flags_t session_handle::save_dht_settings;
constexpr save_state_flags_t session_handle::save_dht_state;
constexpr save_state_flags_t session_handle::save_encryption_settings;
#ifndef TORRENT_NO_DEPRECATE
constexpr save_state_flags_t session_handle::save_encryption_settings;
constexpr save_state_flags_t session_handle::save_as_map TORRENT_DEPRECATED_ENUM;
constexpr save_state_flags_t session_handle::save_proxy TORRENT_DEPRECATED_ENUM;
constexpr save_state_flags_t session_handle::save_i2p_proxy TORRENT_DEPRECATED_ENUM;

3
src/string_util.cpp
View File

@ -44,8 +44,7 @@ POSSIBILITY OF SUCH DAMAGE.
namespace libtorrent {
// lexical_cast's result depends on the locale. We need
// a well defined result
// We need well defined results that don't depend on locale
std::array<char, 4 + std::numeric_limits<std::int64_t>::digits10>
to_string(std::int64_t const n)
{