diff options
author | Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com> | 2021-01-26 14:04:14 +0100 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2021-01-31 17:52:07 +0200 |
commit | 33bfe7b7ef68d6221ad340ad117815e30f8fe6aa (patch) | |
tree | 0c7a4a8025ac54bdca3427f6b8c3c5b447108ccb /include/libcamera/span.h | |
parent | 3809fd77463f8f9f30d8da56fc3b103c683fba72 (diff) |
Revert "libcamera: span: Provide and use helper variable templates for type traits"
Some applications may not be compliant with C++17 (Chromium, as an
example). Keep the C++17 features for libcamera internals, and C++14
compliance for public API.
This reverts commit 8e42c2feb7ff7c350ffbbf97dd963dfd54e21faa.
Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'include/libcamera/span.h')
-rw-r--r-- | include/libcamera/span.h | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/include/libcamera/span.h b/include/libcamera/span.h index e7ffef12..d720adb8 100644 --- a/include/libcamera/span.h +++ b/include/libcamera/span.h @@ -31,9 +31,6 @@ 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 { }; @@ -42,9 +39,6 @@ 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 { @@ -161,8 +155,8 @@ public: template<class Container> explicit constexpr Span(Container &cont, - std::enable_if_t<!details::is_span_v<Container> && - !details::is_array_v<Container> && + std::enable_if_t<!details::is_span<Container>::value && + !details::is_array<Container>::value && !std::is_array_v<Container> && std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], element_type (*)[]>, @@ -173,8 +167,8 @@ public: template<class Container> explicit constexpr Span(const Container &cont, - std::enable_if_t<!details::is_span_v<Container> && - !details::is_array_v<Container> && + std::enable_if_t<!details::is_span<Container>::value && + !details::is_array<Container>::value && !std::is_array_v<Container> && std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], element_type (*)[]>, @@ -323,8 +317,8 @@ public: template<class Container> constexpr Span(Container &cont, - std::enable_if_t<!details::is_span_v<Container> && - !details::is_array_v<Container> && + std::enable_if_t<!details::is_span<Container>::value && + !details::is_array<Container>::value && !std::is_array_v<Container> && std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], element_type (*)[]>, @@ -335,8 +329,8 @@ public: template<class Container> constexpr Span(const Container &cont, - std::enable_if_t<!details::is_span_v<Container> && - !details::is_array_v<Container> && + std::enable_if_t<!details::is_span<Container>::value && + !details::is_array<Container>::value && !std::is_array_v<Container> && std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], element_type (*)[]>, |