fixed a full-check bug in storage. Changed the asio includes to avoid require boost.regex headers
This commit is contained in:
parent
4c54064819
commit
db4ca12c02
|
@ -1,3 +1,5 @@
|
||||||
|
* fixed a bug in storage that would, in rare cases, fail to do a
|
||||||
|
complete check.
|
||||||
* exposed more settings for tweaking parameters in the piece-picker,
|
* exposed more settings for tweaking parameters in the piece-picker,
|
||||||
downloader and uploader (http_settings replaced by session_settings).
|
downloader and uploader (http_settings replaced by session_settings).
|
||||||
* tweaked default settings to improve high bandwidth transfers.
|
* tweaked default settings to improve high bandwidth transfers.
|
||||||
|
|
|
@ -45,7 +45,11 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||||
#define Protocol Protocol_
|
#define Protocol Protocol_
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <asio.hpp>
|
#include <asio/ip/tcp.hpp>
|
||||||
|
#include <asio/ip/udp.hpp>
|
||||||
|
#include <asio/io_service.hpp>
|
||||||
|
#include <asio/deadline_timer.hpp>
|
||||||
|
#include <asio/write.hpp>
|
||||||
|
|
||||||
#ifdef __OBJC__
|
#ifdef __OBJC__
|
||||||
#undef Protocol
|
#undef Protocol
|
||||||
|
|
|
@ -1289,6 +1289,7 @@ namespace libtorrent
|
||||||
have_pieces[other_piece] = true;
|
have_pieces[other_piece] = true;
|
||||||
m_slot_to_piece[other_slot] = other_piece;
|
m_slot_to_piece[other_slot] = other_piece;
|
||||||
m_piece_to_slot[other_piece] = other_slot;
|
m_piece_to_slot[other_piece] = other_slot;
|
||||||
|
++num_pieces;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -1304,6 +1305,7 @@ namespace libtorrent
|
||||||
assert(m_piece_to_slot[piece_index] >= 0);
|
assert(m_piece_to_slot[piece_index] >= 0);
|
||||||
m_piece_to_slot[piece_index] = has_no_slot;
|
m_piece_to_slot[piece_index] = has_no_slot;
|
||||||
#ifndef NDEBUG
|
#ifndef NDEBUG
|
||||||
|
// to make the assert happy, a few lines down
|
||||||
have_pieces[piece_index] = false;
|
have_pieces[piece_index] = false;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue