diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-10-26 21:15:11 +0200 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-10-28 03:32:58 +0200 |
| commit | 6cbdc2859963e17bc897a4022f1d68170477d888 (patch) | |
| tree | cc58ed2ab2abc10fd9b2eae1e021d083ee01aa88 /include/libcamera/span.h | |
| parent | 7adf3a069839c1b2c440b07ca2911ffc2d39e816 (diff) | |
libcamera: Use helper variable template for type traits
C++17 introduces helper variable templates for type traits, allowing
shortening std::is_foo<T>::value to std::is_foo_v<T>. Use them through
the code base.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Diffstat (limited to 'include/libcamera/span.h')
| -rw-r--r-- | include/libcamera/span.h | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/include/libcamera/span.h b/include/libcamera/span.h index 91e9f974..d720adb8 100644 --- a/include/libcamera/span.h +++ b/include/libcamera/span.h @@ -125,8 +125,8 @@ public: template<std::size_t N> constexpr Span(element_type (&arr)[N], - std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[], - element_type (*)[]>::value && + std::enable_if_t<std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(arr))> (*)[], + element_type (*)[]> && N == Extent, std::nullptr_t> = nullptr) noexcept : data_(arr) @@ -135,8 +135,8 @@ public: template<std::size_t N> constexpr Span(std::array<value_type, N> &arr, - std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[], - element_type (*)[]>::value && + std::enable_if_t<std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(arr))> (*)[], + element_type (*)[]> && N == Extent, std::nullptr_t> = nullptr) noexcept : data_(arr.data()) @@ -145,8 +145,8 @@ public: template<std::size_t N> constexpr Span(const std::array<value_type, N> &arr, - std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[], - element_type (*)[]>::value && + std::enable_if_t<std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(arr))> (*)[], + element_type (*)[]> && N == Extent, std::nullptr_t> = nullptr) noexcept : data_(arr.data()) @@ -157,9 +157,9 @@ public: explicit constexpr Span(Container &cont, std::enable_if_t<!details::is_span<Container>::value && !details::is_array<Container>::value && - !std::is_array<Container>::value && - std::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], - element_type (*)[]>::value, + !std::is_array_v<Container> && + std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], + element_type (*)[]>, std::nullptr_t> = nullptr) : data_(utils::data(cont)) { @@ -169,9 +169,9 @@ public: explicit constexpr Span(const Container &cont, std::enable_if_t<!details::is_span<Container>::value && !details::is_array<Container>::value && - !std::is_array<Container>::value && - std::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], - element_type (*)[]>::value, + !std::is_array_v<Container> && + std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], + element_type (*)[]>, std::nullptr_t> = nullptr) : data_(utils::data(cont)) { @@ -180,7 +180,7 @@ public: template<class U, std::size_t N> explicit constexpr Span(const Span<U, N> &s, - std::enable_if_t<std::is_convertible<U (*)[], element_type (*)[]>::value && + std::enable_if_t<std::is_convertible_v<U (*)[], element_type (*)[]> && N == Extent, std::nullptr_t> = nullptr) noexcept : data_(s.data()) @@ -293,8 +293,8 @@ public: template<std::size_t N> constexpr Span(element_type (&arr)[N], - std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[], - element_type (*)[]>::value, + std::enable_if_t<std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(arr))> (*)[], + element_type (*)[]>, std::nullptr_t> = nullptr) noexcept : data_(arr), size_(N) { @@ -302,8 +302,8 @@ public: template<std::size_t N> constexpr Span(std::array<value_type, N> &arr, - std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[], - element_type (*)[]>::value, + std::enable_if_t<std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(arr))> (*)[], + element_type (*)[]>, std::nullptr_t> = nullptr) noexcept : data_(utils::data(arr)), size_(N) { @@ -319,9 +319,9 @@ public: constexpr Span(Container &cont, std::enable_if_t<!details::is_span<Container>::value && !details::is_array<Container>::value && - !std::is_array<Container>::value && - std::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], - element_type (*)[]>::value, + !std::is_array_v<Container> && + std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], + element_type (*)[]>, std::nullptr_t> = nullptr) : data_(utils::data(cont)), size_(utils::size(cont)) { @@ -331,9 +331,9 @@ public: constexpr Span(const Container &cont, std::enable_if_t<!details::is_span<Container>::value && !details::is_array<Container>::value && - !std::is_array<Container>::value && - std::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], - element_type (*)[]>::value, + !std::is_array_v<Container> && + std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], + element_type (*)[]>, std::nullptr_t> = nullptr) : data_(utils::data(cont)), size_(utils::size(cont)) { @@ -341,7 +341,7 @@ public: template<class U, std::size_t N> constexpr Span(const Span<U, N> &s, - std::enable_if_t<std::is_convertible<U (*)[], element_type (*)[]>::value, + std::enable_if_t<std::is_convertible_v<U (*)[], element_type (*)[]>, std::nullptr_t> = nullptr) noexcept : data_(s.data()), size_(s.size()) { |