From 95b753778db5686bf3086bdac68b7b3ae2c80960 Mon Sep 17 00:00:00 2001 From: Alden Torres Date: Mon, 11 Jun 2018 18:46:22 -0400 Subject: [PATCH] use TORRENT_ABI_VERSION for new error_code_enum deprecated values (#3099) --- include/libtorrent/error_code.hpp | 9 ++++++++- test/test_primitives.cpp | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/libtorrent/error_code.hpp b/include/libtorrent/error_code.hpp index 7aa769bf0..28c098e8d 100644 --- a/include/libtorrent/error_code.hpp +++ b/include/libtorrent/error_code.hpp @@ -326,6 +326,7 @@ namespace libtorrent { // the listen socket associated with this request was closed invalid_listen_socket, +#if TORRENT_ABI_VERSION == 1 // these error codes are deprecated, NAT-PMP/PCP error codes have // been moved to their own category @@ -339,7 +340,13 @@ namespace libtorrent { no_resources TORRENT_DEPRECATED_ENUM, // The NAT-PMP router failed because an unsupported opcode was sent unsupported_opcode TORRENT_DEPRECATED_ENUM, - +#else + deprecated_120 = 120, + deprecated_121, + deprecated_122, + deprecated_123, + deprecated_124, +#endif // The resume data file is missing the 'file sizes' entry diff --git a/test/test_primitives.cpp b/test/test_primitives.cpp index f3bcb5997..bb7119ef7 100644 --- a/test/test_primitives.cpp +++ b/test/test_primitives.cpp @@ -66,8 +66,10 @@ TORRENT_TEST(primitives) TEST_CHECK(error_code(errors::http_error).message() == "HTTP error"); TEST_CHECK(error_code(errors::missing_file_sizes).message() == "missing or invalid 'file sizes' entry"); +#if TORRENT_ABI_VERSION == 1 TEST_CHECK(error_code(errors::unsupported_protocol_version).message() == "unsupported protocol version"); +#endif TEST_CHECK(error_code(errors::no_i2p_router).message() == "no i2p router is set up"); TEST_CHECK(error_code(errors::http_parse_error).message() == "Invalid HTTP header"); TEST_CHECK(error_code(errors::error_code_max).message() == "Unknown error");