diff options
Diffstat (limited to 'compat/map.hpp')
| -rw-r--r-- | compat/map.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compat/map.hpp b/compat/map.hpp index 9bcceadb..3c1610d4 100644 --- a/compat/map.hpp +++ b/compat/map.hpp @@ -9,7 +9,7 @@ namespace floormat::detail::map { template<typename T, typename F, size_t N, size_t... Indexes> CORRADE_ALWAYS_INLINE -constexpr auto map0(const std::array<T, N>& array, const F& fun, std::index_sequence<Indexes...>) +constexpr auto map0(const F& fun, const std::array<T, N>& array, std::index_sequence<Indexes...>) { return std::array { fun(array[Indexes])... }; } @@ -17,7 +17,7 @@ constexpr auto map0(const std::array<T, N>& array, const F& fun, std::index_sequ template<typename T, typename F> [[deprecated("zero-length array!")]] CORRADE_ALWAYS_INLINE -constexpr auto map0(const std::array<T, 0>&, const F&, std::index_sequence<>) +constexpr auto map0(const F&, const std::array<T, 0>&, std::index_sequence<>) { return std::array<std::decay_t<std::invoke_result_t<std::decay_t<F>, const std::remove_cvref_t<T>&>>, 0>{}; } @@ -27,14 +27,14 @@ constexpr auto map0(const std::array<T, 0>&, const F&, std::index_sequence<>) namespace floormat { template<typename T, std::invocable<const T&> F, size_t N> -constexpr auto map(const std::array<T, N>& array, const F& fun) +constexpr auto map(const F& fun, const std::array<T, N>& array) { using return_type = std::decay_t<decltype( fun(array[0]) )>; static_assert(!std::is_same_v<return_type, void>); static_assert(std::is_same_v<T, std::decay_t<T>>); static_assert(sizeof(return_type) > 0); using ::floormat::detail::map::map0; - return map0(array, fun, std::make_index_sequence<N>{}); + return map0(fun, array, std::make_index_sequence<N>{}); } } // namespace floormat |