diff --git a/include/libtorrent/identify_client.hpp b/include/libtorrent/identify_client.hpp index ac61f6d78..c5a8da2a0 100644 --- a/include/libtorrent/identify_client.hpp +++ b/include/libtorrent/identify_client.hpp @@ -46,6 +46,8 @@ POSSIBILITY OF SUCH DAMAGE. namespace libtorrent { + // TODO: hide these declarations when deprecaated functions are disabled, and + // expose them internally in a header under aux_. // these functions don't really need to be public. This mechanism of // advertising client software and version is also out-dated. @@ -63,7 +65,6 @@ namespace libtorrent TORRENT_DEPRECATED_EXPORT TORRENT_DEPRECATED boost::optional client_fingerprint(peer_id const& p); - } #endif // TORRENT_IDENTIFY_CLIENT_HPP_INCLUDED diff --git a/test/test_identify_client.cpp b/test/test_identify_client.cpp index bc2866aa1..2683fca04 100644 --- a/test/test_identify_client.cpp +++ b/test/test_identify_client.cpp @@ -37,6 +37,7 @@ using namespace libtorrent; TORRENT_TEST(identify_client) { +#ifndef TORRENT_NO_DEPRECATE TEST_EQUAL(identify_client(peer_id("-AZ123B-............")), "Azureus 1.2.3.11"); TEST_EQUAL(identify_client(peer_id("-AZ1230-............")), "Azureus 1.2.3"); TEST_EQUAL(identify_client(peer_id("S123--..............")), "Shadow 1.2.3"); @@ -44,5 +45,6 @@ TORRENT_TEST(identify_client) TEST_EQUAL(identify_client(peer_id("M1-2-3--............")), "Mainline 1.2.3"); TEST_EQUAL(identify_client(peer_id("\0\0\0\0\0\0\0\0\0\0\0\0........")), "Generic"); TEST_EQUAL(identify_client(peer_id("-xx1230-............")), "xx 1.2.3"); +#endif }