rTorrent: Bump c++ standard to 17

This pull request cleans up the deprecated TR1 functions and bumps the c++ standard to 17.
stickz · Jan 18, 2025 · 2cf5130 · 2cf5130
1 parent f5b6c78
commit 2cf5130
Show file tree

Hide file tree

Showing 18 changed files with 16 additions and 80 deletions.
diff --git a/rtorrent/configure.ac b/rtorrent/configure.ac
@@ -16,13 +16,12 @@ RAK_ENABLE_DEBUG
 RAK_ENABLE_EXTRA_DEBUG
 RAK_ENABLE_WERROR
 
-RAK_CHECK_CXX11
-RAK_CHECK_TR1_LIB
-
 TORRENT_DISABLE_IPV6
 
 AC_SYS_LARGEFILE
 
+AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
+
 TORRENT_CHECK_EXECINFO
 
 TORRENT_ENABLE_ARCH

diff --git a/rtorrent/rak/priority_queue_default.h b/rtorrent/rak/priority_queue_default.h
@@ -37,7 +37,7 @@
 #ifndef RAK_PRIORITY_QUEUE_DEFAULT_H
 #define RAK_PRIORITY_QUEUE_DEFAULT_H
 
-#include lt_tr1_functional
+#include <functional>
 #include <rak/allocators.h>
 #include <rak/priority_queue.h>
 #include <rak/timer.h>

diff --git a/rtorrent/scripts/rak_cxx.m4 b/rtorrent/scripts/rak_cxx.m4
diff --git a/rtorrent/src/core/download_factory.h b/rtorrent/src/core/download_factory.h
@@ -44,7 +44,7 @@
 #include <iosfwd>
 #include <rak/priority_queue_default.h>
 #include <torrent/object.h>
-#include lt_tr1_functional
+#include <functional>
 
 #include "http_queue.h"
 

diff --git a/rtorrent/src/core/download_slot_map.h b/rtorrent/src/core/download_slot_map.h
@@ -39,7 +39,7 @@
 
 #include <map>
 #include <string>
-#include lt_tr1_functional
+#include <functional>
 
 #include "download.h"
 

diff --git a/rtorrent/src/core/http_queue.h b/rtorrent/src/core/http_queue.h
@@ -39,7 +39,7 @@
 
 #include <list>
 #include <iosfwd>
-#include lt_tr1_functional
+#include <functional>
 
 namespace core {
 

diff --git a/rtorrent/src/core/view.h b/rtorrent/src/core/view.h
@@ -53,7 +53,7 @@
 #include <vector>
 #include <rak/timer.h>
 #include <torrent/object.h>
-#include lt_tr1_functional
+#include <functional>
 
 #include "globals.h"
 

diff --git a/rtorrent/src/display/frame.cc b/rtorrent/src/display/frame.cc
@@ -38,7 +38,6 @@
 
 #include <algorithm>
 #include <functional>
-#include lt_tr1_functional
 #include <rak/algorithm.h>
 #include <torrent/exceptions.h>
 

diff --git a/rtorrent/src/display/window_http_queue.h b/rtorrent/src/display/window_http_queue.h
@@ -37,7 +37,7 @@
 #ifndef RTORRENT_DISPLAY_WINDOW_HTTP_QUEUE_H
 #define RTORRENT_DISPLAY_WINDOW_HTTP_QUEUE_H
 
-#include lt_tr1_functional
+#include <functional>
 
 #include "window.h"
 

diff --git a/rtorrent/src/input/bindings.h b/rtorrent/src/input/bindings.h
@@ -38,7 +38,7 @@
 #define RTORRENT_INPUT_BINDINGS_H
 
 #include <map>
-#include lt_tr1_functional
+#include <functional>
 
 #include "display/attributes.h"
 

diff --git a/rtorrent/src/input/input_event.h b/rtorrent/src/input/input_event.h
@@ -39,7 +39,7 @@
 
 #include <torrent/event.h>
 #include <torrent/poll.h>
-#include lt_tr1_functional
+#include <functional>
 
 namespace input {
 

diff --git a/rtorrent/src/input/path_input.h b/rtorrent/src/input/path_input.h
@@ -38,7 +38,7 @@
 #define RTORRENT_INPUT_PATH_INPUT_H
 
 #include <list>
-#include lt_tr1_functional
+#include <functional>
 
 #include "utils/directory.h"
 #include "text_input.h"

diff --git a/rtorrent/src/option_parser.h b/rtorrent/src/option_parser.h
@@ -39,7 +39,7 @@
 
 #include <map>
 #include <string>
-#include lt_tr1_functional
+#include <functional>
 
 // Throws std::runtime_error upon receiving bad input.
 

diff --git a/rtorrent/src/rpc/command.h b/rtorrent/src/rpc/command.h
@@ -41,7 +41,6 @@
 #include <limits>
 #include <inttypes.h>
 #include <torrent/object.h>
-#include lt_tr1_functional
 
 #include <torrent/object.h>
 #include <torrent/data/file_list_iterator.h>

diff --git a/rtorrent/src/rpc/command_scheduler_item.h b/rtorrent/src/rpc/command_scheduler_item.h
@@ -39,7 +39,7 @@
 
 #include "globals.h"
 
-#include lt_tr1_functional
+#include <functional>
 #include <torrent/object.h>
 
 namespace rpc {

diff --git a/rtorrent/src/rpc/object_storage.h b/rtorrent/src/rpc/object_storage.h
@@ -42,7 +42,7 @@
 #define RTORRENT_RPC_OBJECT_STORAGE_H
 
 #include <cstring>
-#include lt_tr1_unordered_map
+#include <unordered_map>
 #include <torrent/object.h>
 
 #include "rak/unordered_vector.h"

diff --git a/rtorrent/src/signal_handler.h b/rtorrent/src/signal_handler.h
@@ -38,7 +38,7 @@
 #define RTORRENT_SIGNAL_HANDLER_H
 
 #include <signal.h>
-#include lt_tr1_functional
+#include <functional>
 
 class SignalHandler {
 public:

diff --git a/rtorrent/src/utils/list_focus.h b/rtorrent/src/utils/list_focus.h
@@ -37,7 +37,7 @@
 #ifndef RTORRENT_UTILS_LIST_FOCUS_H
 #define RTORRENT_UTILS_LIST_FOCUS_H
 
-#include lt_tr1_functional
+#include <functional>
 
 namespace utils {