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

fix merge issue

This commit is contained in:
arvidn 2016-03-18 13:53:30 -04:00
parent 6d1a744a5c
commit b017bb1854
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/libtorrent/settings_pack.hpp
View File

@ -276,7 +276,7 @@ namespace libtorrent
#ifndef TORRENT_NO_DEPRECATED #ifndef TORRENT_NO_DEPRECATED
use_write_cache, use_write_cache,
#else #else
deprecated7, deprecated11,
#endif #endif
// this will make the disk cache never flush a write piece if it would // this will make the disk cache never flush a write piece if it would
@ -362,7 +362,7 @@ namespace libtorrent
// overhead of a system call. // overhead of a system call.
lock_disk_cache, lock_disk_cache,
#else #else
deprecated8, deprecated10,
#endif #endif
// when set to true, all data downloaded from peers will be assumed to // when set to true, all data downloaded from peers will be assumed to