From 22b745d548c2776b5a51f499eb631f872e5cca06 Mon Sep 17 00:00:00 2001 From: Alden Torres Date: Tue, 24 Jan 2017 11:51:02 -0500 Subject: [PATCH] added TORRENT_NO_DEPRECATE around file_progress_float --- include/libtorrent/torrent.hpp | 4 ++-- src/torrent.cpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/libtorrent/torrent.hpp b/include/libtorrent/torrent.hpp index 745f8dd58..228df40d9 100644 --- a/include/libtorrent/torrent.hpp +++ b/include/libtorrent/torrent.hpp @@ -512,11 +512,11 @@ namespace libtorrent bool delete_files(int options); void peers_erased(std::vector const& peers); - // ============ start deprecation ============= +#ifndef TORRENT_NO_DEPRECATE #if !TORRENT_NO_FPU void file_progress_float(aux::vector& fp); #endif - // ============ end deprecation ============= +#endif // TORRENT_NO_DEPRECATE void piece_availability(aux::vector& avail) const; diff --git a/src/torrent.cpp b/src/torrent.cpp index 91a68e2d7..fcd224d49 100644 --- a/src/torrent.cpp +++ b/src/torrent.cpp @@ -10174,6 +10174,7 @@ namespace libtorrent #endif } +#ifndef TORRENT_NO_DEPRECATE #if !TORRENT_NO_FPU void torrent::file_progress_float(aux::vector& fp) { @@ -10198,6 +10199,7 @@ namespace libtorrent } } #endif +#endif // TORRENT_NO_DEPRECATE void torrent::file_progress(aux::vector& fp, int const flags) {