fix -Wclass-memaccess warning

likely generates the exact same code. Reference: rakshasa/libtorrent#280
stickz · Dec 22, 2024 · 33495c4 · 33495c4
1 parent faede8a
commit 33495c4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/libtorrent/rak/partial_queue.h b/libtorrent/rak/partial_queue.h
@@ -37,6 +37,7 @@
 #ifndef RAK_PARTIAL_QUEUE_H
 #define RAK_PARTIAL_QUEUE_H
 
+#include <array>
 #include <cstring>
 #include <stdexcept>
 #include <inttypes.h>
@@ -107,7 +108,7 @@ class partial_queue {
   size_type           m_index;
   size_type           m_ceiling;
 
-  size_pair_type      m_layers[num_layers];
+  std::array<size_pair_type, num_layers> m_layers;
 };
 
 inline void
@@ -137,7 +138,7 @@ partial_queue::clear() {
   m_index = 0;
   m_ceiling = ceiling(num_layers - 1);
 
-  std::memset(m_layers, 0, num_layers * sizeof(size_pair_type));
+  m_layers = {};
 }
 
 inline bool

diff --git a/rtorrent/rak/partial_queue.h b/rtorrent/rak/partial_queue.h
@@ -37,6 +37,7 @@
 #ifndef RAK_PARTIAL_QUEUE_H
 #define RAK_PARTIAL_QUEUE_H
 
+#include <array>
 #include <cstring>
 #include <stdexcept>
 #include <inttypes.h>
@@ -107,7 +108,7 @@ class partial_queue {
   size_type           m_index;
   size_type           m_ceiling;
 
-  size_pair_type      m_layers[num_layers];
+  std::array<size_pair_type, num_layers> m_layers;
 };
 
 inline void
@@ -137,7 +138,7 @@ partial_queue::clear() {
   m_index = 0;
   m_ceiling = ceiling(num_layers - 1);
 
-  std::memset(m_layers, 0, num_layers * sizeof(size_pair_type));
+  m_layers = {};
 }
 
 inline bool