Remove detail::make_array

Morwenn · Morwenn · commit 5a398bdc44fd · 2025-09-19T01:03:32.000+02:00
diff --git a/include/cpp-sort/detail/make_array.h b/include/cpp-sort/detail/make_array.h
diff --git a/include/cpp-sort/fixed/merge_exchange_network_sorter.h b/include/cpp-sort/fixed/merge_exchange_network_sorter.h
@@ -20,7 +20,6 @@
 #include "../detail/bitops.h"
 #include "../detail/empty_sorter.h"
 #include "../detail/iterator_traits.h"
-#include "../detail/make_array.h"
 #include "../detail/type_traits.h"
 
 namespace cppsort
@@ -71,7 +70,7 @@ namespace cppsort
                 constexpr DifferenceType n = N;
                 constexpr DifferenceType nb_pairs = merge_exchange_pairs_number(n);
 
-                utility::index_pair<DifferenceType> pairs[nb_pairs] = {};
+                std::array<utility::index_pair<DifferenceType>, nb_pairs> pairs = {};
                 std::size_t current_pair_idx = 0;
 
                 DifferenceType t = detail::ceil_log2(n);
@@ -93,7 +92,7 @@ namespace cppsort
                     }
                 }
 
-                return cppsort::detail::make_array(pairs);
+                return pairs;
             }
 
             template<
diff --git a/include/cpp-sort/fixed/odd_even_merge_network_sorter.h b/include/cpp-sort/fixed/odd_even_merge_network_sorter.h
@@ -20,7 +20,6 @@
 #include "../detail/bitops.h"
 #include "../detail/empty_sorter.h"
 #include "../detail/iterator_traits.h"
-#include "../detail/make_array.h"
 #include "../detail/type_traits.h"
 
 namespace cppsort
@@ -65,7 +64,7 @@ namespace cppsort
                 constexpr DifferenceType n = N;
                 constexpr DifferenceType nb_pairs = odd_even_merge_pairs_number(n);
 
-                utility::index_pair<DifferenceType> pairs[nb_pairs] = {};
+                std::array<utility::index_pair<DifferenceType>, nb_pairs> pairs = {};
                 std::size_t current_pair_idx = 0;
 
                 for (DifferenceType p = 1; p < n; p *= 2) {
@@ -81,7 +80,7 @@ namespace cppsort
                     }
                 }
 
-                return cppsort::detail::make_array(pairs);
+                return pairs;
             }
 
             template<

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`#include "../detail/bitops.h"`
`21`	`21`	`#include "../detail/empty_sorter.h"`
`22`	`22`	`#include "../detail/iterator_traits.h"`
`23`		`-#include "../detail/make_array.h"`
`24`	`23`	`#include "../detail/type_traits.h"`
`25`	`24`
`26`	`25`	`namespace cppsort`
`@@ -71,7 +70,7 @@ namespace cppsort`
`71`	`70`	`constexpr DifferenceType n = N;`
`72`	`71`	`constexpr DifferenceType nb_pairs = merge_exchange_pairs_number(n);`
`73`	`72`
`74`		`- utility::index_pair<DifferenceType> pairs[nb_pairs] = {};`
	`73`	`+ std::array<utility::index_pair<DifferenceType>, nb_pairs> pairs = {};`
`75`	`74`	`std::size_t current_pair_idx = 0;`
`76`	`75`
`77`	`76`	`DifferenceType t = detail::ceil_log2(n);`
`@@ -93,7 +92,7 @@ namespace cppsort`
`93`	`92`	`}`
`94`	`93`	`}`
`95`	`94`
`96`		`- return cppsort::detail::make_array(pairs);`
	`95`	`+ return pairs;`
`97`	`96`	`}`
`98`	`97`
`99`	`98`	`template<`