43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
|
diff -Nru libtorrent-rasterbar-0.13.1.orig/include/libtorrent/disk_io_thread.hpp libtorrent-rasterbar-0.13.1/include/libtorrent/disk_io_thread.hpp
|
||
|
|
--- libtorrent-rasterbar-0.13.1.orig/include/libtorrent/disk_io_thread.hpp 2008-04-09 10:48:02.000000000 +0200
|
||
|
|
+++ libtorrent-rasterbar-0.13.1/include/libtorrent/disk_io_thread.hpp 2008-10-31 17:43:07.000000000 +0100
|
||
|
|
@@ -132,7 +132,7 @@
|
||
|
|
|
||
|
|
typedef boost::recursive_mutex mutex_t;
|
||
|
|
mutable mutex_t m_mutex;
|
||
|
|
- boost::condition m_signal;
|
||
|
|
+ boost::condition_variable_any m_signal;
|
||
|
|
bool m_abort;
|
||
|
|
std::list<disk_io_job> m_jobs;
|
||
|
|
size_type m_queue_buffer_size;
|
||
|
|
diff -Nru libtorrent-rasterbar-0.13.1.orig/src/torrent_info.cpp libtorrent-rasterbar-0.13.1/src/torrent_info.cpp
|
||
|
|
--- libtorrent-rasterbar-0.13.1.orig/src/torrent_info.cpp 2008-07-01 18:03:01.000000000 +0200
|
||
|
|
+++ libtorrent-rasterbar-0.13.1/src/torrent_info.cpp 2008-10-31 17:42:39.000000000 +0100
|
||
|
|
@@ -354,7 +354,7 @@
|
||
|
|
{
|
||
|
|
m_name = tmp.leaf();
|
||
|
|
}
|
||
|
|
- else if (tmp.has_branch_path())
|
||
|
|
+ else if (tmp.has_parent_path())
|
||
|
|
{
|
||
|
|
fs::path p;
|
||
|
|
for (fs::path::iterator i = tmp.begin()
|
||
|
|
@@ -572,7 +572,7 @@
|
||
|
|
{
|
||
|
|
// TORRENT_ASSERT(file.begin() != file.end());
|
||
|
|
|
||
|
|
- if (!file.has_branch_path())
|
||
|
|
+ if (!file.has_parent_path())
|
||
|
|
{
|
||
|
|
// you have already added at least one file with a
|
||
|
|
// path to the file (branch_path), which means that
|
||
|
|
@@ -662,7 +662,7 @@
|
||
|
|
fs::path const* file_path;
|
||
|
|
if (i->orig_path) file_path = &(*i->orig_path);
|
||
|
|
else file_path = &i->path;
|
||
|
|
- TORRENT_ASSERT(file_path->has_branch_path());
|
||
|
|
+ TORRENT_ASSERT(file_path->has_parent_path());
|
||
|
|
TORRENT_ASSERT(*file_path->begin() == m_name);
|
||
|
|
|
||
|
|
for (fs::path::iterator j = boost::next(file_path->begin());
|