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

one more fix related to typed_span conversion (#2050)

This commit is contained in:
Alden Torres 2017-06-02 00:42:03 -04:00 committed by Arvid Norberg
parent 6967d17a42
commit b1b3f0e3e8
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/libtorrent/aux_/storage_utils.hpp
View File

@ -37,6 +37,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/config.hpp" #include "libtorrent/config.hpp"
#include "libtorrent/span.hpp" #include "libtorrent/span.hpp"
#include "libtorrent/aux_/typed_span.hpp"
#include "libtorrent/units.hpp" #include "libtorrent/units.hpp"
#include "libtorrent/storage_defs.hpp" // for status_t #include "libtorrent/storage_defs.hpp" // for status_t
@ -56,7 +57,7 @@ namespace libtorrent {
TORRENT_EXTRA_EXPORT int copy_bufs(span<iovec_t const> bufs TORRENT_EXTRA_EXPORT int copy_bufs(span<iovec_t const> bufs
, int bytes, span<iovec_t> target); , int bytes, span<iovec_t> target);
TORRENT_EXTRA_EXPORT span<iovec_t> advance_bufs(span<iovec_t> bufs, int bytes); TORRENT_EXTRA_EXPORT typed_span<iovec_t> advance_bufs(typed_span<iovec_t> bufs, int bytes);
// this is a read or write operation so that readwritev() knows // this is a read or write operation so that readwritev() knows
// what to do when it's actually touching the file // what to do when it's actually touching the file

2
src/storage_utils.cpp
View File

@ -63,7 +63,7 @@ namespace libtorrent { namespace aux {
return ret; return ret;
} }
span<iovec_t> advance_bufs(span<iovec_t> bufs, int const bytes) typed_span<iovec_t> advance_bufs(typed_span<iovec_t> bufs, int const bytes)
{ {
TORRENT_ASSERT(bytes >= 0); TORRENT_ASSERT(bytes >= 0);
std::size_t size = 0; std::size_t size = 0;