From fc5ed962a804f1f7c5d1f4187195910d9c021cc9 Mon Sep 17 00:00:00 2001 From: Jakob Petsovits Date: Tue, 21 Jul 2015 14:00:36 -0400 Subject: [PATCH 1/2] Fix outdated C bindings code so it at least can build again. --- bindings/c/library.cpp | 18 +++++++++--------- bindings/c/libtorrent.h | 1 - 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/bindings/c/library.cpp b/bindings/c/library.cpp index b40131537..9ac20dc42 100644 --- a/bindings/c/library.cpp +++ b/bindings/c/library.cpp @@ -31,11 +31,13 @@ POSSIBILITY OF SUCH DAMAGE. */ #include "libtorrent/session.hpp" +#include "libtorrent/session_status.hpp" #include "libtorrent/magnet_uri.hpp" #include "libtorrent/torrent_handle.hpp" #include #include +#include namespace { @@ -186,7 +188,7 @@ TORRENT_EXPORT int session_add_torrent(void* ses, int tag, ...) switch (tag) { case TOR_FILENAME: - params.ti = new (std::nothrow) torrent_info(va_arg(lp, char const*), ec); + params.ti.reset(new (std::nothrow) torrent_info(va_arg(lp, char const*), ec)); break; case TOR_TORRENT: torrent_data = va_arg(lp, char const*); @@ -195,13 +197,13 @@ TORRENT_EXPORT int session_add_torrent(void* ses, int tag, ...) torrent_size = va_arg(lp, int); break; case TOR_INFOHASH: - params.ti = new (std::nothrow) torrent_info(sha1_hash(va_arg(lp, char const*))); + params.ti.reset(new (std::nothrow) torrent_info(sha1_hash(va_arg(lp, char const*)))); break; case TOR_INFOHASH_HEX: { sha1_hash ih; from_hex(va_arg(lp, char const*), 40, (char*)&ih[0]); - params.ti = new (std::nothrow) torrent_info(ih); + params.ti.reset(new (std::nothrow) torrent_info(ih)); break; } case TOR_MAGNETLINK: @@ -253,13 +255,12 @@ TORRENT_EXPORT int session_add_torrent(void* ses, int tag, ...) } if (!params.ti && torrent_data && torrent_size) - params.ti = new (std::nothrow) torrent_info(torrent_data, torrent_size); + params.ti.reset(new (std::nothrow) torrent_info(torrent_data, torrent_size)); std::vector rd; if (resume_data && resume_size) { - rd.assign(resume_data, resume_data + resume_size); - params.resume_data = &rd; + params.resume_data.assign(resume_data, resume_data + resume_size); } torrent_handle h; if (!params.ti && magnet_url) @@ -490,8 +491,8 @@ TORRENT_EXPORT int torrent_get_status(int tor, torrent_status* s, int struct_siz s->paused = ts.paused; s->progress = ts.progress; strncpy(s->error, ts.error.c_str(), 1025); - s->next_announce = ts.next_announce.total_seconds(); - s->announce_interval = ts.announce_interval.total_seconds(); + s->next_announce = libtorrent::total_seconds(ts.next_announce); + s->announce_interval = libtorrent::total_seconds(ts.announce_interval); strncpy(s->current_tracker, ts.current_tracker.c_str(), 512); s->total_download = ts.total_download = ts.total_download = ts.total_download; s->total_upload = ts.total_upload = ts.total_upload = ts.total_upload; @@ -530,7 +531,6 @@ TORRENT_EXPORT int torrent_get_status(int tor, torrent_status* s, int struct_siz s->seed_rank = ts.seed_rank; s->last_scrape = ts.last_scrape; s->has_incoming = ts.has_incoming; - s->sparse_regions = ts.sparse_regions; s->seed_mode = ts.seed_mode; return 0; } diff --git a/bindings/c/libtorrent.h b/bindings/c/libtorrent.h index c80906d05..d90ade47c 100644 --- a/bindings/c/libtorrent.h +++ b/bindings/c/libtorrent.h @@ -195,7 +195,6 @@ struct torrent_status int seed_rank; int last_scrape; int has_incoming; - int sparse_regions; int seed_mode; }; From a3316ec49df47d2ec45e618649b84e4e39acd122 Mon Sep 17 00:00:00 2001 From: Jakob Petsovits Date: Mon, 2 Nov 2015 14:17:59 -0500 Subject: [PATCH 2/2] CMake build: Asio is now used header-only, remove definitions saying otherwise. --- examples/cmake/FindLibtorrentRasterbar.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/examples/cmake/FindLibtorrentRasterbar.cmake b/examples/cmake/FindLibtorrentRasterbar.cmake index 28f5b0a91..1edeab971 100644 --- a/examples/cmake/FindLibtorrentRasterbar.cmake +++ b/examples/cmake/FindLibtorrentRasterbar.cmake @@ -39,11 +39,9 @@ else() -DUNICODE -D_UNICODE -D_FILE_OFFSET_BITS=64) endif() - if(LibtorrentRasterbar_USE_STATIC_LIBS) - list(APPEND LibtorrentRasterbar_DEFINITIONS -DBOOST_ASIO_SEPARATE_COMPILATION) - else() + if(NOT LibtorrentRasterbar_USE_STATIC_LIBS) list(APPEND LibtorrentRasterbar_DEFINITIONS - -DTORRENT_LINKING_SHARED -DBOOST_ASIO_DYN_LINK + -DTORRENT_LINKING_SHARED -DBOOST_SYSTEM_DYN_LINK -DBOOST_CHRONO_DYN_LINK) endif() endif()