Move some ambisonic-related macros to a separate header

1 files changed, 6 insertions, 1 deletions

diff --git a/Alc/ambdec.cpp b/Alc/ambdec.cpp
index 8b251187..e37a5a09 100644
--- a/Alc/ambdec.cpp
+++ b/Alc/ambdec.cpp
@@ -12,11 +12,16 @@
 #include <fstream>
 #include <sstream>
 
+#include "logging.h"
 #include "compat.h"
 
 
 namespace {
 
+template<typename T, std::size_t N>
+constexpr inline std::size_t size(const T(&)[N]) noexcept
+{ return N; }
+
 int readline(std::istream &f, std::string &output)
 {
     while(f.good() && f.peek() == '\n')
@@ -148,7 +153,7 @@ bool load_ambdec_matrix(float (&gains)[MAX_AMBI_ORDER+1], al::vector<AmbDecConf:
                         buffer.c_str()+static_cast<std::size_t>(istr.tellg()));
                     return false;
                 }
-                if(curgain < countof(gains))
+                if(curgain < size(gains))
                     gains[curgain++] = value;
             }
             std::fill(std::begin(gains)+curgain, std::end(gains), 0.0f);