Merge remote-tracking branch 'upstream/master'

1 files changed, 4 insertions, 12 deletions

diff --git a/core/cubic_tables.cpp b/core/cubic_tables.cpp
index 73ec6b3f..5e7aafad 100644
--- a/core/cubic_tables.cpp
+++ b/core/cubic_tables.cpp
@@ -1,24 +1,16 @@
 
 #include "cubic_tables.h"
 
-#include <algorithm>
 #include <array>
-#include <cassert>
-#include <cmath>
-#include <limits>
-#include <memory>
-#include <stdexcept>
+#include <stddef.h>
 
-#include "alnumbers.h"
-#include "core/mixer/defs.h"
+#include "cubic_defs.h"
 
 
 namespace {
 
-using uint = unsigned int;
-
 struct SplineFilterArray {
-    alignas(16) CubicCoefficients mTable[CubicPhaseCount]{};
+    alignas(16) std::array<CubicCoefficients,CubicPhaseCount> mTable{};
 
     constexpr SplineFilterArray()
     {
@@ -49,7 +41,7 @@ struct SplineFilterArray {
         mTable[pi].mDeltas[3] = -mTable[pi].mCoeffs[3];
     }
 
-    constexpr auto getTable() const noexcept { return al::as_span(mTable); }
+    constexpr auto& getTable() const noexcept { return mTable; }
 };
 
 constexpr SplineFilterArray SplineFilter{};