From 69ff30f50f87139e6fb6cc66f43eb4573d069a76 Mon Sep 17 00:00:00 2001 From: arvidn Date: Wed, 27 Dec 2017 11:21:13 +0100 Subject: [PATCH] deprecate save_encryption_settings (they are part of the normal settings) --- ChangeLog | 1 + bindings/python/src/session.cpp | 2 +- include/libtorrent/session_handle.hpp | 7 +++---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index bacb1605f..3d0f991e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ + * 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) diff --git a/bindings/python/src/session.cpp b/bindings/python/src/session.cpp index 317ab03f0..a54ddeb69 100644 --- a/bindings/python/src/session.cpp +++ b/bindings/python/src/session.cpp @@ -1047,8 +1047,8 @@ void bind_session() .value("save_settings", lt::session::save_settings) .value("save_dht_settings", lt::session::save_dht_settings) .value("save_dht_state", lt::session::save_dht_state) - .value("save_encryption_settings", lt::session:: save_encryption_settings) #ifndef TORRENT_NO_DEPRECATE + .value("save_encryption_settings", lt::session:: save_encryption_settings) .value("save_as_map", lt::session::save_as_map) .value("save_i2p_proxy", lt::session::save_i2p_proxy) .value("save_proxy", lt::session::save_proxy) diff --git a/include/libtorrent/session_handle.hpp b/include/libtorrent/session_handle.hpp index 798d0e4d5..e11d28ff1 100644 --- a/include/libtorrent/session_handle.hpp +++ b/include/libtorrent/session_handle.hpp @@ -89,13 +89,12 @@ namespace libtorrent // saves dht state such as nodes and node-id, possibly accelerating // joining the DHT if provided at next session startup. - save_dht_state = 0x004, - - // save pe_settings - save_encryption_settings = 0x020 + save_dht_state = 0x004 #ifndef TORRENT_NO_DEPRECATE , + // save pe_settings + save_encryption_settings TORRENT_DEPRECATED_ENUM = 0x020, save_as_map TORRENT_DEPRECATED_ENUM = 0x040, // saves RSS feeds save_feeds TORRENT_DEPRECATED_ENUM = 0x080,