use array_size instead of std::size/arraySize

2 files changed, 5 insertions, 3 deletions

diff --git a/test/app.cpp b/test/app.cpp
index 4a80cb20..91c56b29 100644
--- a/test/app.cpp
+++ b/test/app.cpp
@@ -1,5 +1,6 @@
 #include "app.hpp"
 #include "loader/loader.hpp"
+#include "compat/array-size.hpp"
 #include "compat/headless.hpp"
 #include <stdlib.h> // NOLINT(*-deprecated-headers)
 #include <cstdio>
@@ -48,7 +49,7 @@ int App::exec()
     constexpr auto SV_flags = StringViewFlag::Global|StringViewFlag::NullTerminated;
     constexpr auto name_prefix = "test_"_s;
 
-#define FM_TEST(name) { ( StringView{#name, arraySize(#name)-1, SV_flags} ), ( &(name) ), }
+#define FM_TEST(name) { ( StringView{#name, array_size(#name)-1, SV_flags} ), ( &(name) ), }
 
     constexpr struct {
         StringView name;
diff --git a/test/bitmask.cpp b/test/bitmask.cpp
index 3e04f737..574c840c 100644
--- a/test/bitmask.cpp
+++ b/test/bitmask.cpp
@@ -2,6 +2,7 @@
 #include "src/anim-atlas.hpp"
 #include "loader/loader.hpp"
 #include "compat/assert.hpp"
+#include "compat/array-size.hpp"
 #include <mg/Functions.h>
 #include <mg/ImageData.h>
 
@@ -13,7 +14,7 @@ const unsigned char src[] = {
 #include "bitmask.embed.inc"
 };
 
-constexpr auto data_nbytes = arraySize(src);
+constexpr auto data_nbytes = array_size(src);
 constexpr auto size = Vector2i{21, 52};
 //static_assert(size_t{size.product()+7}/8 <= data_nbytes);
 
@@ -36,7 +37,7 @@ void bitmask_test()
     fflush(stdout);
 #endif
     const auto len = Math::min(data_nbytes, (size_t)bitmask.size()+7 >> 3);
-    fm_assert(arraySize(src) >= len);
+    fm_assert(array_size(src) >= len);
     for (auto i = 0uz; i < len; i++)
     {
         auto a = (unsigned char)bitmask.data()[i];