M17: replaced std::experimental::array with std:array
This commit is contained in:
parent
5b7f835817
commit
b16c3c0fd1
|
|
@ -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
|
||||
);
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
#error This header is C++ only!
|
||||
#endif
|
||||
|
||||
#include <experimental/array>
|
||||
#include <string>
|
||||
#include <array>
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
Loading…
Reference in New Issue