wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

fix master build (#1833) 

fix master build
This commit is contained in:
Arvid Norberg 2017-03-19 18:53:05 -04:00 committed by GitHub
parent 64f5567cdd
commit cd0777d4a9
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/libtorrent/add_torrent_params.hpp
View File

@ -82,7 +82,6 @@ namespace libtorrent
#include "libtorrent/aux_/disable_warnings_push.hpp" #include "libtorrent/aux_/disable_warnings_push.hpp"
struct TORRENT_EXPORT add_torrent_params struct TORRENT_EXPORT add_torrent_params
{ {
#include "libtorrent/aux_/disable_warnings_pop.hpp"
// The constructor can be used to initialize the storage constructor, // The constructor can be used to initialize the storage constructor,
// which determines the storage mechanism for the downloaded or seeding // which determines the storage mechanism for the downloaded or seeding
// data for the torrent. For more information, see the ``storage`` field. // data for the torrent. For more information, see the ``storage`` field.
@ -260,8 +259,6 @@ namespace libtorrent
flag_merge_resume_http_seeds TORRENT_DEPRECATED_ENUM = 0x100000, flag_merge_resume_http_seeds TORRENT_DEPRECATED_ENUM = 0x100000,
#endif #endif
#include "libtorrent/aux_/disable_warnings_push.hpp"
// internal // internal
default_flags = flag_update_subscribe default_flags = flag_update_subscribe
| flag_auto_managed | flag_paused | flag_apply_ip_filter | flag_auto_managed | flag_paused | flag_apply_ip_filter
@ -271,9 +268,9 @@ namespace libtorrent
| flag_merge_resume_http_seeds | flag_merge_resume_http_seeds
| flag_merge_resume_trackers | flag_merge_resume_trackers
#endif #endif
};
#include "libtorrent/aux_/disable_warnings_pop.hpp" #include "libtorrent/aux_/disable_warnings_pop.hpp"
};
// filled in by the constructor and should be left untouched. It is used // filled in by the constructor and should be left untouched. It is used
// for forward binary compatibility. // for forward binary compatibility.

4
include/libtorrent/session_handle.hpp
View File

@ -87,6 +87,8 @@ namespace libtorrent
// TODO: 2 the ip filter should probably be saved here too // TODO: 2 the ip filter should probably be saved here too
#include "libtorrent/aux_/disable_warnings_push.hpp"
// flags that determines which aspects of the session should be // flags that determines which aspects of the session should be
// saved when calling save_state(). // saved when calling save_state().
enum save_state_flags_t enum save_state_flags_t
@ -116,6 +118,8 @@ namespace libtorrent
#endif #endif
}; };
#include "libtorrent/aux_/disable_warnings_pop.hpp"
// loads and saves all session settings, including dht_settings, // loads and saves all session settings, including dht_settings,
// encryption settings and proxy settings. ``save_state`` writes all keys // encryption settings and proxy settings. ``save_state`` writes all keys
// to the ``entry`` that's passed in, which needs to either not be // to the ``entry`` that's passed in, which needs to either not be