From b16c3c0fd1e26bbba8cfc65fdc42a4807ad24aa3 Mon Sep 17 00:00:00 2001
From: Jim Ancona <jim@anconafamily.com>
Date: Sun, 29 Dec 2024 08:16:12 -0500
Subject: [PATCH] M17: replaced std::experimental::array with std:array

---
 .../include/protocols/M17/M17CodePuncturing.hpp    | 14 +++++++-------
 openrtx/include/protocols/M17/M17Decorrelator.hpp  |  1 -
 openrtx/src/protocols/M17/M17Modulator.cpp         |  1 -
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/openrtx/include/protocols/M17/M17CodePuncturing.hpp b/openrtx/include/protocols/M17/M17CodePuncturing.hpp
index 79ba2831..8edaddfc 100644
--- a/openrtx/include/protocols/M17/M17CodePuncturing.hpp
+++ b/openrtx/include/protocols/M17/M17CodePuncturing.hpp
@@ -27,7 +27,7 @@
 #error This header is C++ only!
 #endif
 
-#include <experimental/array>
+#include <array>
 #include "M17Utils.hpp"
 
 namespace M17
@@ -36,21 +36,21 @@ namespace M17
 /**
  * Puncture matrix for linx setup frame.
  */
-static constexpr auto LSF_PUNCTURE = std::experimental::make_array< uint8_t >
-(
+static constexpr std::array< uint8_t, 61 > LSF_PUNCTURE =
+{
     1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1,
     0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1,
     1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1
-);
+};
 
 /**
  *  Puncture matrix for audio frames.
  */
-static constexpr auto DATA_PUNCTURE = std::experimental::make_array< uint8_t >
-(
+static constexpr std::array< uint8_t, 12 > DATA_PUNCTURE =
+{
     1, 1, 1, 1, 1, 1,
     1, 1, 1, 1, 1, 0
-);
+};
 
 
 /**
diff --git a/openrtx/include/protocols/M17/M17Decorrelator.hpp b/openrtx/include/protocols/M17/M17Decorrelator.hpp
index a16baa4c..f8aaf4a6 100644
--- a/openrtx/include/protocols/M17/M17Decorrelator.hpp
+++ b/openrtx/include/protocols/M17/M17Decorrelator.hpp
@@ -27,7 +27,6 @@
 #error This header is C++ only!
 #endif
 
-#include <experimental/array>
 #include <string>
 #include <array>
 
diff --git a/openrtx/src/protocols/M17/M17Modulator.cpp b/openrtx/src/protocols/M17/M17Modulator.cpp
index c5bb546c..d781688a 100644
--- a/openrtx/src/protocols/M17/M17Modulator.cpp
+++ b/openrtx/src/protocols/M17/M17Modulator.cpp
@@ -21,7 +21,6 @@
 #include <new>
 #include <cstddef>
 #include <cstring>
-#include <experimental/array>
 #include <M17/M17Modulator.hpp>
 #include <M17/M17Utils.hpp>
 #include <M17/M17DSP.hpp>