commit 2fae1d0f9367b1fc5bf11050bd189855dba00ec9
author Davide Pesavento <davidepesa@gmail.com> Sat Jun 08 20:02:27 2024 -0400
committer Davide Pesavento <davidepesa@gmail.com> Sun Jun 09 12:03:46 2024 -0400
tree 9c6e47bc6bb50da134d22ba9447bee8c7d0eb750
parent 4b7cffb0c4e7c4bc4f0130d5fbc18aeb3108aaa0

face: use std::array

Change-Id: I5d52fd75b6ff35988e74415972041f9b12a0fa89

daemon/face/ethernet-transport.cpp

diff --git a/daemon/face/ethernet-transport.cpp b/daemon/face/ethernet-transport.cpp
index 9ddbdb7..57cae35 100644
--- a/daemon/face/ethernet-transport.cpp
+++ b/daemon/face/ethernet-transport.cpp
@@ -29,6 +29,8 @@
 
 #include <pcap/pcap.h>
 
+#include <array>
+
 #include <boost/asio/defer.hpp>
 #include <boost/endian/conversion.hpp>
 
@@ -118,11 +120,14 @@
 
   // pad with zeroes if the payload is too short
   if (block.size() < ethernet::MIN_DATA_LEN) {
-    static const uint8_t padding[ethernet::MIN_DATA_LEN] = {};
-    buffer.appendBytes(ndn::make_span(padding).subspan(block.size()));
+    static const std::array<uint8_t, ethernet::MIN_DATA_LEN> padding{};
+    buffer.appendBytes(ndn::span(padding).subspan(block.size()));
   }
 
   // construct and prepend the ethernet header
+#if BOOST_VERSION >= 107200
+  constexpr
+#endif
   uint16_t ethertype = boost::endian::native_to_big(ethernet::ETHERTYPE_NDN);
   buffer.prependBytes({reinterpret_cast<const uint8_t*>(&ethertype), ethernet::TYPE_LEN});
   buffer.prependBytes(m_srcAddress);