forked from premiere/premiere-libtorrent
merged changes from RC_0_16
This commit is contained in:
parent
bdf0e1764b
commit
0a09eeca9f
|
@ -194,10 +194,12 @@ namespace libtorrent
|
|||
, boost::function<void(int)> f, error_code& ec)
|
||||
{
|
||||
file_pool fp;
|
||||
std::string path = complete(p);
|
||||
#if TORRENT_USE_UNC_PATHS
|
||||
path = canonicalize_path(path);
|
||||
std::string path = canonicalize_path(p);
|
||||
#else
|
||||
std::string const& path = p;
|
||||
#endif
|
||||
|
||||
boost::scoped_ptr<storage_interface> st(
|
||||
default_storage_constructor(const_cast<file_storage&>(t.files()), 0, path, fp
|
||||
, std::vector<boost::uint8_t>()));
|
||||
|
|
|
@ -391,7 +391,6 @@ namespace libtorrent
|
|||
, m_page_size(page_size())
|
||||
, m_allocate_files(false)
|
||||
{
|
||||
TORRENT_ASSERT(is_complete(path));
|
||||
if (mapped) m_mapped_files.reset(new file_storage(*mapped));
|
||||
|
||||
TORRENT_ASSERT(m_files.begin() != m_files.end());
|
||||
|
|
Loading…
Reference in New Issue