libtorrent: Bump c++ standard to 17

resolves crash when compiling with -march=native.
stickz · Jan 13, 2025 · b6f8abb · b6f8abb
1 parent 2d93d3c
commit b6f8abb
Show file tree

Hide file tree

Showing 23 changed files with 25 additions and 88 deletions.
diff --git a/libtorrent/configure.ac b/libtorrent/configure.ac
@@ -28,15 +28,14 @@ AC_C_BIGENDIAN(
     AC_MSG_ERROR([Could not determine endianness])
 )
 
+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
-
 AC_SYS_LARGEFILE
 
 TORRENT_ENABLE_ALIGNED

diff --git a/libtorrent/rak/priority_queue_default.h b/libtorrent/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/libtorrent/scripts/rak_cxx.m4 b/libtorrent/scripts/rak_cxx.m4
diff --git a/libtorrent/src/data/chunk_list.h b/libtorrent/src/data/chunk_list.h
@@ -39,8 +39,7 @@
 
 #include <string>
 #include <vector>
-#include lt_tr1_functional
-
+#include <functional>
 #include "chunk.h"
 #include "chunk_handle.h"
 #include "chunk_list_node.h"

diff --git a/libtorrent/src/data/hash_check_queue.h b/libtorrent/src/data/hash_check_queue.h
@@ -39,7 +39,7 @@
 
 #include <deque>
 #include <pthread.h>
-#include lt_tr1_functional
+#include <functional>
 
 #include "rak/allocators.h"
 

diff --git a/libtorrent/src/download/delegator.h b/libtorrent/src/download/delegator.h
@@ -39,7 +39,7 @@
 
 #include <string>
 #include <vector>
-#include lt_tr1_functional
+#include <functional>
 
 #include "torrent/data/transfer_list.h"
 

diff --git a/libtorrent/src/net/listen.h b/libtorrent/src/net/listen.h
@@ -38,7 +38,7 @@
 #define LIBTORRENT_LISTEN_H
 
 #include <inttypes.h>
-#include lt_tr1_functional
+#include <functional>
 #include <rak/socket_address.h>
 
 #include "socket_base.h"

diff --git a/libtorrent/src/net/throttle_node.h b/libtorrent/src/net/throttle_node.h
@@ -37,7 +37,7 @@
 #ifndef LIBTORRENT_NET_THROTTLE_NODE_H
 #define LIBTORRENT_NET_THROTTLE_NODE_H
 
-#include lt_tr1_functional
+#include <functional>
 
 #include "torrent/rate.h"
 

diff --git a/libtorrent/src/torrent/data/download_data.h b/libtorrent/src/torrent/data/download_data.h
@@ -37,7 +37,7 @@
 #ifndef LIBTORRENT_DATA_DOWNLOAD_DATA_H
 #define LIBTORRENT_DATA_DOWNLOAD_DATA_H
 
-#include lt_tr1_functional
+#include <functional>
 
 #include <torrent/common.h>
 #include <torrent/bitfield.h>

diff --git a/libtorrent/src/torrent/data/transfer_list.h b/libtorrent/src/torrent/data/transfer_list.h
@@ -39,7 +39,7 @@
 
 #include <vector>
 #include <torrent/common.h>
-#include lt_tr1_functional
+#include <functional>
 
 namespace torrent {
 

diff --git a/libtorrent/src/torrent/download/group_entry.h b/libtorrent/src/torrent/download/group_entry.h
@@ -39,7 +39,7 @@
 
 #include <algorithm>
 #include <vector>
-#include lt_tr1_functional
+#include <functional>
 #include <torrent/common.h>
 #include <torrent/exceptions.h>
 

diff --git a/libtorrent/src/torrent/download_info.h b/libtorrent/src/torrent/download_info.h
@@ -40,7 +40,7 @@
 #include <list>
 #include <string>
 #include <inttypes.h>
-#include lt_tr1_functional
+#include <functional>
 
 #include <torrent/rate.h>
 #include <torrent/hash_string.h>

diff --git a/libtorrent/src/torrent/poll.h b/libtorrent/src/torrent/poll.h
@@ -37,7 +37,7 @@
 #ifndef LIBTORRENT_TORRENT_POLL_H
 #define LIBTORRENT_TORRENT_POLL_H
 
-#include lt_tr1_functional
+#include <functional>
 
 #include <torrent/common.h>
 

diff --git a/libtorrent/src/torrent/tracker_controller.h b/libtorrent/src/torrent/tracker_controller.h
@@ -38,7 +38,7 @@
 #define LIBTORRENT_TRACKER_CONTROLLER_H
 
 #include <string>
-#include lt_tr1_functional
+#include <functional>
 #include <torrent/common.h>
 #include <torrent/tracker.h>
 

diff --git a/libtorrent/src/torrent/tracker_list.h b/libtorrent/src/torrent/tracker_list.h
@@ -41,7 +41,7 @@
 #include <string>
 #include <vector>
 #include <torrent/common.h>
-#include lt_tr1_functional
+#include <functional>
 
 namespace torrent {
 

diff --git a/libtorrent/src/torrent/utils/log.h b/libtorrent/src/torrent/utils/log.h
@@ -40,8 +40,8 @@
 #include <bitset>
 #include <string>
 #include <vector>
-#include lt_tr1_array
-#include lt_tr1_functional
+#include <array>
+#include <functional>
 #include <torrent/common.h>
 
 namespace torrent {

diff --git a/libtorrent/src/torrent/utils/log_buffer.h b/libtorrent/src/torrent/utils/log_buffer.h
@@ -40,7 +40,7 @@
 #include <string>
 #include <deque>
 #include <pthread.h>
-#include lt_tr1_functional
+#include <functional>
 #include <torrent/common.h>
 
 namespace torrent {

diff --git a/libtorrent/src/torrent/utils/net.h b/libtorrent/src/torrent/utils/net.h
@@ -38,7 +38,7 @@
 #define LIBTORRENT_UTILS_NET_H
 
 #include <netdb.h>
-#include lt_tr1_functional
+#include <functional>
 
 namespace torrent {
 

diff --git a/libtorrent/src/torrent/utils/signal_bitfield.h b/libtorrent/src/torrent/utils/signal_bitfield.h
@@ -37,7 +37,7 @@
 #ifndef LIBTORRENT_UTILS_SIGNAL_BITFIELD_H
 #define LIBTORRENT_UTILS_SIGNAL_BITFIELD_H
 
-#include lt_tr1_functional
+#include <functional>
 #include <torrent/common.h>
 
 namespace torrent {

diff --git a/libtorrent/src/torrent/utils/thread_base.h b/libtorrent/src/torrent/utils/thread_base.h
@@ -41,7 +41,7 @@
 #include <sys/types.h>
 #include <torrent/common.h>
 #include <torrent/utils/signal_bitfield.h>
-#include lt_tr1_functional
+#include <functional>
 
 namespace torrent {
 

diff --git a/libtorrent/src/utils/instrumentation.h b/libtorrent/src/utils/instrumentation.h
@@ -36,8 +36,8 @@
 
 #ifndef LIBTORRENT_UTILS_INSTRUMENTATION_H
 #define LIBTORRENT_UTILS_INSTRUMENTATION_H
-#include lt_tr1_array
 
+#include <array>
 #include <algorithm>
 
 #include "torrent/common.h"

diff --git a/libtorrent/src/utils/queue_buckets.h b/libtorrent/src/utils/queue_buckets.h
@@ -39,8 +39,8 @@
 
 #include <algorithm>
 #include <deque>
-#include lt_tr1_functional
-#include lt_tr1_array
+#include <functional>
+#include <array>
 
 namespace torrent {
 

diff --git a/libtorrent/src/utils/udnsevent.h b/libtorrent/src/utils/udnsevent.h
@@ -1,7 +1,7 @@
 #ifndef LIBTORRENT_NET_UDNSEVENT_H
 #define LIBTORRENT_NET_UDNSEVENT_H
 
-#include lt_tr1_functional
+#include <functional>
 
 #include <list>
 #include <inttypes.h>