diff options
Diffstat (limited to 'include/libcamera/span.h')
| -rw-r--r-- | include/libcamera/span.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/include/libcamera/span.h b/include/libcamera/span.h index d720adb8..e7ffef12 100644 --- a/include/libcamera/span.h +++ b/include/libcamera/span.h @@ -31,6 +31,9 @@ template<typename U, std::size_t N> struct is_array<std::array<U, N>> : public std::true_type { }; +template<typename T> +inline constexpr bool is_array_v = is_array<T>::value; + template<typename U> struct is_span : public std::false_type { }; @@ -39,6 +42,9 @@ template<typename U, std::size_t Extent> struct is_span<Span<U, Extent>> : public std::true_type { }; +template<typename T> +inline constexpr bool is_span_v = is_span<T>::value; + } /* namespace details */ namespace utils { @@ -155,8 +161,8 @@ public: template<class Container> explicit constexpr Span(Container &cont, - std::enable_if_t<!details::is_span<Container>::value && - !details::is_array<Container>::value && + std::enable_if_t<!details::is_span_v<Container> && + !details::is_array_v<Container> && !std::is_array_v<Container> && std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], element_type (*)[]>, @@ -167,8 +173,8 @@ public: template<class Container> explicit constexpr Span(const Container &cont, - std::enable_if_t<!details::is_span<Container>::value && - !details::is_array<Container>::value && + std::enable_if_t<!details::is_span_v<Container> && + !details::is_array_v<Container> && !std::is_array_v<Container> && std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], element_type (*)[]>, @@ -317,8 +323,8 @@ public: template<class Container> constexpr Span(Container &cont, - std::enable_if_t<!details::is_span<Container>::value && - !details::is_array<Container>::value && + std::enable_if_t<!details::is_span_v<Container> && + !details::is_array_v<Container> && !std::is_array_v<Container> && std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], element_type (*)[]>, @@ -329,8 +335,8 @@ public: template<class Container> constexpr Span(const Container &cont, - std::enable_if_t<!details::is_span<Container>::value && - !details::is_array<Container>::value && + std::enable_if_t<!details::is_span_v<Container> && + !details::is_array_v<Container> && !std::is_array_v<Container> && std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], element_type (*)[]>, |