PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: span: Provide and use helper variable templates for type traits

Browse Source 
Following the C++17 practice, provide is_array_v<T> and is_span_v<T>
helper variable templates as shorter versions of is_array<T>::value and
is_span<T>::value, and use them through the code.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart
2020-10-26 21:29:01 +02:00
parent 6cbdc28599
commit 8e42c2feb7
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/libcamera/controls.h
+6 -6
View File
@@ -96,7 +96,7 @@ public:
ControlValue(); ControlValue();
#ifndef __DOXYGEN__ #ifndef __DOXYGEN__
template<typename T, typename std::enable_if_t<!details::is_span<T>::value && template<typename T, typename std::enable_if_t<!details::is_span_v<T> &&
details::control_type<T>::value && details::control_type<T>::value &&
!std::is_same_v<std::string, std::remove_cv_t<T>>, !std::is_same_v<std::string, std::remove_cv_t<T>>,
std::nullptr_t> = nullptr> std::nullptr_t> = nullptr>
@@ -107,7 +107,7 @@ public:
&value, 1, sizeof(T)); &value, 1, sizeof(T));
} }
template<typename T, typename std::enable_if_t<details::is_span<T>::value || template<typename T, typename std::enable_if_t<details::is_span_v<T> ||
std::is_same_v<std::string, std::remove_cv_t<T>>, std::is_same_v<std::string, std::remove_cv_t<T>>,
std::nullptr_t> = nullptr> std::nullptr_t> = nullptr>
#else #else
@@ -141,7 +141,7 @@ public:
} }
#ifndef __DOXYGEN__ #ifndef __DOXYGEN__
template<typename T, typename std::enable_if_t<!details::is_span<T>::value && template<typename T, typename std::enable_if_t<!details::is_span_v<T> &&
!std::is_same_v<std::string, std::remove_cv_t<T>>, !std::is_same_v<std::string, std::remove_cv_t<T>>,
std::nullptr_t> = nullptr> std::nullptr_t> = nullptr>
T get() const T get() const
@@ -152,7 +152,7 @@ public:
return *reinterpret_cast<const T *>(data().data()); return *reinterpret_cast<const T *>(data().data());
} }
template<typename T, typename std::enable_if_t<details::is_span<T>::value || template<typename T, typename std::enable_if_t<details::is_span_v<T> ||
std::is_same_v<std::string, std::remove_cv_t<T>>, std::is_same_v<std::string, std::remove_cv_t<T>>,
std::nullptr_t> = nullptr> std::nullptr_t> = nullptr>
#else #else
@@ -169,7 +169,7 @@ public:
} }
#ifndef __DOXYGEN__ #ifndef __DOXYGEN__
template<typename T, typename std::enable_if_t<!details::is_span<T>::value && template<typename T, typename std::enable_if_t<!details::is_span_v<T> &&
!std::is_same_v<std::string, std::remove_cv_t<T>>, !std::is_same_v<std::string, std::remove_cv_t<T>>,
std::nullptr_t> = nullptr> std::nullptr_t> = nullptr>
void set(const T &value) void set(const T &value)
@@ -178,7 +178,7 @@ public:
reinterpret_cast<const void *>(&value), 1, sizeof(T)); reinterpret_cast<const void *>(&value), 1, sizeof(T));
} }
template<typename T, typename std::enable_if_t<details::is_span<T>::value || template<typename T, typename std::enable_if_t<details::is_span_v<T> ||
std::is_same_v<std::string, std::remove_cv_t<T>>, std::is_same_v<std::string, std::remove_cv_t<T>>,
std::nullptr_t> = nullptr> std::nullptr_t> = nullptr>
#else #else
include/libcamera/span.h
+14 -8
View File
@@ -31,6 +31,9 @@ template<typename U, std::size_t N>
struct is_array<std::array<U, N>> : public std::true_type { 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> template<typename U>
struct is_span : public std::false_type { 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 { 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 details */
namespace utils { namespace utils {
@@ -155,8 +161,8 @@ public:
template<class Container> template<class Container>
explicit constexpr Span(Container &cont, explicit constexpr Span(Container &cont,
std::enable_if_t<!details::is_span<Container>::value && std::enable_if_t<!details::is_span_v<Container> &&
!details::is_array<Container>::value && !details::is_array_v<Container> &&
!std::is_array_v<Container> && !std::is_array_v<Container> &&
std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],
element_type (*)[]>, element_type (*)[]>,
@@ -167,8 +173,8 @@ public:
template<class Container> template<class Container>
explicit constexpr Span(const Container &cont, explicit constexpr Span(const Container &cont,
std::enable_if_t<!details::is_span<Container>::value && std::enable_if_t<!details::is_span_v<Container> &&
!details::is_array<Container>::value && !details::is_array_v<Container> &&
!std::is_array_v<Container> && !std::is_array_v<Container> &&
std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],
element_type (*)[]>, element_type (*)[]>,
@@ -317,8 +323,8 @@ public:
template<class Container> template<class Container>
constexpr Span(Container &cont, constexpr Span(Container &cont,
std::enable_if_t<!details::is_span<Container>::value && std::enable_if_t<!details::is_span_v<Container> &&
!details::is_array<Container>::value && !details::is_array_v<Container> &&
!std::is_array_v<Container> && !std::is_array_v<Container> &&
std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],
element_type (*)[]>, element_type (*)[]>,
@@ -329,8 +335,8 @@ public:
template<class Container> template<class Container>
constexpr Span(const Container &cont, constexpr Span(const Container &cont,
std::enable_if_t<!details::is_span<Container>::value && std::enable_if_t<!details::is_span_v<Container> &&
!details::is_array<Container>::value && !details::is_array_v<Container> &&
!std::is_array_v<Container> && !std::is_array_v<Container> &&
std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],
element_type (*)[]>, element_type (*)[]>,