rTorrent: Bump c++ standard to 17 (#75)

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

Hide file tree

Showing 26 changed files with 1,944 additions and 591 deletions.
diff --git a/libtorrent/scripts/ax_cxx_compile_stdcxx.m4 b/libtorrent/scripts/ax_cxx_compile_stdcxx.m4
diff --git a/libtorrent/scripts/ax_cxx_compile_stdcxx_0x.m4 b/libtorrent/scripts/ax_cxx_compile_stdcxx_0x.m4
diff --git a/libtorrent/scripts/ax_cxx_compile_stdcxx_11.m4 b/libtorrent/scripts/ax_cxx_compile_stdcxx_11.m4
diff --git a/libtorrent/src/torrent/connection_manager.h b/libtorrent/src/torrent/connection_manager.h
@@ -45,8 +45,8 @@
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
-#include <sys/socket.h>
 #include <functional>
+#include <sys/socket.h>
 #include <torrent/common.h>
 
 #ifdef USE_UDNS

diff --git a/libtorrent/src/torrent/utils/log.h b/libtorrent/src/torrent/utils/log.h
@@ -38,10 +38,10 @@
 #define LIBTORRENT_UTILS_LOG_H
 
 #include <bitset>
+#include <functional>
 #include <string>
 #include <vector>
 #include <array>
-#include <functional>
 #include <torrent/common.h>
 
 namespace torrent {

diff --git a/rtorrent/configure.ac b/rtorrent/configure.ac
@@ -3,26 +3,24 @@ AC_INIT(rtorrent, 0.9.8, [email protected])
 AC_DEFINE(API_VERSION, 10, api version)
 AC_DEFINE(STICKZ_VERSION, "0.9.8-v7.2", rtorrent stickz version)
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign subdir-objects])
 AC_CONFIG_HEADERS(config.h)
 
 AC_PROG_RANLIB
 AC_PROG_CXX
 AC_PROG_LIBTOOL
+AC_SYS_LARGEFILE
+
+AX_CXX_COMPILE_STDCXX(17, noext, mandatory)
 
 RAK_CHECK_CFLAGS
 RAK_CHECK_CXXFLAGS
 RAK_ENABLE_DEBUG
 RAK_ENABLE_EXTRA_DEBUG
 RAK_ENABLE_WERROR
 
-RAK_CHECK_CXX11
-RAK_CHECK_TR1_LIB
-
 TORRENT_DISABLE_IPV6
 
-AC_SYS_LARGEFILE
-
 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>