fix merge issue

2016-03-18 13:53:30 -04:00 · 2016-03-18 13:53:30 -04:00 · b017bb1854
parent 6d1a744a5c
commit b017bb1854
1 changed files with 2 additions and 2 deletions
--- a/include/libtorrent/settings_pack.hpp
+++ b/include/libtorrent/settings_pack.hpp
@ -276,7 +276,7 @@ namespace libtorrent
 #ifndef TORRENT_NO_DEPRECATED
 			use_write_cache,
 #else
-			deprecated7,
+			deprecated11,
 #endif

 			// 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.
 			lock_disk_cache,
 #else
-			deprecated8,
+			deprecated10,
 #endif

 			// when set to true, all data downloaded from peers will be assumed to