Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-19 18:35:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "libcamera: Use helper variable template for type traits"

Browse source 
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 6cbdc28599.

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>
This commit is contained in:
Jean-Michel Hautbois 2021-01-26 14:04:15 +01:00 • committed by Laurent Pinchart
parent 33bfe7b7ef
commit c763ae023d
5 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/libcamera/bound_method.h
View file

@ -63,7 +63,7 @@ public:
} }
virtual ~BoundMethodBase() = default; virtual ~BoundMethodBase() = default;
template<typename T, typename std::enable_if_t<!std::is_same_v<Object, T>> * = nullptr> template<typename T, typename std::enable_if_t<!std::is_same<Object, T>::value> * = nullptr>
bool match(T *obj) { return obj == obj_; } bool match(T *obj) { return obj == obj_; }
bool match(Object *object) { return object == object_; } bool match(Object *object) { return object == object_; }

12
include/libcamera/controls.h
View file

@ -98,7 +98,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<T>::value &&
details::control_type<T>::value && details::control_type<T>::value &&
!std::is_same_v<std::string, std::remove_cv_t<T>>, !std::is_same<std::string, std::remove_cv_t<T>>::value,
std::nullptr_t> = nullptr> std::nullptr_t> = nullptr>
ControlValue(const T &value) ControlValue(const T &value)
: type_(ControlTypeNone), numElements_(0) : type_(ControlTypeNone), numElements_(0)
@ -108,7 +108,7 @@ public:
} }
template<typename T, typename std::enable_if_t<details::is_span<T>::value || template<typename T, typename std::enable_if_t<details::is_span<T>::value ||
std::is_same_v<std::string, std::remove_cv_t<T>>, std::is_same<std::string, std::remove_cv_t<T>>::value,
std::nullptr_t> = nullptr> std::nullptr_t> = nullptr>
#else #else
template<typename T> template<typename T>
@ -142,7 +142,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<T>::value &&
!std::is_same_v<std::string, std::remove_cv_t<T>>, !std::is_same<std::string, std::remove_cv_t<T>>::value,
std::nullptr_t> = nullptr> std::nullptr_t> = nullptr>
T get() const T get() const
{ {
@ -153,7 +153,7 @@ public:
} }
template<typename T, typename std::enable_if_t<details::is_span<T>::value || template<typename T, typename std::enable_if_t<details::is_span<T>::value ||
std::is_same_v<std::string, std::remove_cv_t<T>>, std::is_same<std::string, std::remove_cv_t<T>>::value,
std::nullptr_t> = nullptr> std::nullptr_t> = nullptr>
#else #else
template<typename T> template<typename T>
@ -170,7 +170,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<T>::value &&
!std::is_same_v<std::string, std::remove_cv_t<T>>, !std::is_same<std::string, std::remove_cv_t<T>>::value,
std::nullptr_t> = nullptr> std::nullptr_t> = nullptr>
void set(const T &value) void set(const T &value)
{ {
@ -179,7 +179,7 @@ public:
} }
template<typename T, typename std::enable_if_t<details::is_span<T>::value || template<typename T, typename std::enable_if_t<details::is_span<T>::value ||
std::is_same_v<std::string, std::remove_cv_t<T>>, std::is_same<std::string, std::remove_cv_t<T>>::value,
std::nullptr_t> = nullptr> std::nullptr_t> = nullptr>
#else #else
template<typename T> template<typename T>

2
include/libcamera/object.h
View file

@ -32,7 +32,7 @@ public:
void postMessage(std::unique_ptr<Message> msg); void postMessage(std::unique_ptr<Message> msg);
template<typename T, typename R, typename... FuncArgs, typename... Args, template<typename T, typename R, typename... FuncArgs, typename... Args,
typename std::enable_if_t<std::is_base_of_v<Object, T>> * = nullptr> typename std::enable_if_t<std::is_base_of<Object, T>::value> * = nullptr>
R invokeMethod(R (T::*func)(FuncArgs...), ConnectionType type, R invokeMethod(R (T::*func)(FuncArgs...), ConnectionType type,
Args... args) Args... args)
{ {

4
include/libcamera/signal.h
View file

@ -44,7 +44,7 @@ public:
} }
#ifndef __DOXYGEN__ #ifndef __DOXYGEN__
template<typename T, typename R, typename std::enable_if_t<std::is_base_of_v<Object, T>> * = nullptr> template<typename T, typename R, typename std::enable_if_t<std::is_base_of<Object, T>::value> * = nullptr>
void connect(T *obj, R (T::*func)(Args...), void connect(T *obj, R (T::*func)(Args...),
ConnectionType type = ConnectionTypeAuto) ConnectionType type = ConnectionTypeAuto)
{ {
@ -52,7 +52,7 @@ public:
SignalBase::connect(new BoundMethodMember<T, void, Args...>(obj, object, func, type)); SignalBase::connect(new BoundMethodMember<T, void, Args...>(obj, object, func, type));
} }
template<typename T, typename R, typename std::enable_if_t<!std::is_base_of_v<Object, T>> * = nullptr> template<typename T, typename R, typename std::enable_if_t<!std::is_base_of<Object, T>::value> * = nullptr>
#else #else
template<typename T, typename R> template<typename T, typename R>
#endif #endif

48
include/libcamera/span.h
View file

@ -125,8 +125,8 @@ public:
template<std::size_t N> template<std::size_t N>
constexpr Span(element_type (&arr)[N], constexpr Span(element_type (&arr)[N],
std::enable_if_t<std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(arr))> (*)[], std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],
element_type (*)[]> && element_type (*)[]>::value &&
N == Extent, N == Extent,
std::nullptr_t> = nullptr) noexcept std::nullptr_t> = nullptr) noexcept
: data_(arr) : data_(arr)
@ -135,8 +135,8 @@ public:
template<std::size_t N> template<std::size_t N>
constexpr Span(std::array<value_type, N> &arr, constexpr Span(std::array<value_type, N> &arr,
std::enable_if_t<std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(arr))> (*)[], std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],
element_type (*)[]> && element_type (*)[]>::value &&
N == Extent, N == Extent,
std::nullptr_t> = nullptr) noexcept std::nullptr_t> = nullptr) noexcept
: data_(arr.data()) : data_(arr.data())
@ -145,8 +145,8 @@ public:
template<std::size_t N> template<std::size_t N>
constexpr Span(const std::array<value_type, N> &arr, constexpr Span(const std::array<value_type, N> &arr,
std::enable_if_t<std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(arr))> (*)[], std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],
element_type (*)[]> && element_type (*)[]>::value &&
N == Extent, N == Extent,
std::nullptr_t> = nullptr) noexcept std::nullptr_t> = nullptr) noexcept
: data_(arr.data()) : data_(arr.data())
@ -157,9 +157,9 @@ public:
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<Container>::value &&
!details::is_array<Container>::value && !details::is_array<Container>::value &&
!std::is_array_v<Container> && !std::is_array<Container>::value &&
std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], std::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],
element_type (*)[]>, element_type (*)[]>::value,
std::nullptr_t> = nullptr) std::nullptr_t> = nullptr)
: data_(utils::data(cont)) : data_(utils::data(cont))
{ {
@ -169,9 +169,9 @@ public:
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<Container>::value &&
!details::is_array<Container>::value && !details::is_array<Container>::value &&
!std::is_array_v<Container> && !std::is_array<Container>::value &&
std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], std::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],
element_type (*)[]>, element_type (*)[]>::value,
std::nullptr_t> = nullptr) std::nullptr_t> = nullptr)
: data_(utils::data(cont)) : data_(utils::data(cont))
{ {
@ -180,7 +180,7 @@ public:
template<class U, std::size_t N> template<class U, std::size_t N>
explicit constexpr Span(const Span<U, N> &s, explicit constexpr Span(const Span<U, N> &s,
std::enable_if_t<std::is_convertible_v<U (*)[], element_type (*)[]> && std::enable_if_t<std::is_convertible<U (*)[], element_type (*)[]>::value &&
N == Extent, N == Extent,
std::nullptr_t> = nullptr) noexcept std::nullptr_t> = nullptr) noexcept
: data_(s.data()) : data_(s.data())
@ -293,8 +293,8 @@ public:
template<std::size_t N> template<std::size_t N>
constexpr Span(element_type (&arr)[N], constexpr Span(element_type (&arr)[N],
std::enable_if_t<std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(arr))> (*)[], std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],
element_type (*)[]>, element_type (*)[]>::value,
std::nullptr_t> = nullptr) noexcept std::nullptr_t> = nullptr) noexcept
: data_(arr), size_(N) : data_(arr), size_(N)
{ {
@ -302,8 +302,8 @@ public:
template<std::size_t N> template<std::size_t N>
constexpr Span(std::array<value_type, N> &arr, constexpr Span(std::array<value_type, N> &arr,
std::enable_if_t<std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(arr))> (*)[], std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],
element_type (*)[]>, element_type (*)[]>::value,
std::nullptr_t> = nullptr) noexcept std::nullptr_t> = nullptr) noexcept
: data_(utils::data(arr)), size_(N) : data_(utils::data(arr)), size_(N)
{ {
@ -319,9 +319,9 @@ public:
constexpr Span(Container &cont, constexpr Span(Container &cont,
std::enable_if_t<!details::is_span<Container>::value && std::enable_if_t<!details::is_span<Container>::value &&
!details::is_array<Container>::value && !details::is_array<Container>::value &&
!std::is_array_v<Container> && !std::is_array<Container>::value &&
std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], std::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],
element_type (*)[]>, element_type (*)[]>::value,
std::nullptr_t> = nullptr) std::nullptr_t> = nullptr)
: data_(utils::data(cont)), size_(utils::size(cont)) : data_(utils::data(cont)), size_(utils::size(cont))
{ {
@ -331,9 +331,9 @@ public:
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<Container>::value &&
!details::is_array<Container>::value && !details::is_array<Container>::value &&
!std::is_array_v<Container> && !std::is_array<Container>::value &&
std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[], std::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],
element_type (*)[]>, element_type (*)[]>::value,
std::nullptr_t> = nullptr) std::nullptr_t> = nullptr)
: data_(utils::data(cont)), size_(utils::size(cont)) : data_(utils::data(cont)), size_(utils::size(cont))
{ {
@ -341,7 +341,7 @@ public:
template<class U, std::size_t N> template<class U, std::size_t N>
constexpr Span(const Span<U, N> &s, constexpr Span(const Span<U, N> &s,
std::enable_if_t<std::is_convertible_v<U (*)[], element_type (*)[]>, std::enable_if_t<std::is_convertible<U (*)[], element_type (*)[]>::value,
std::nullptr_t> = nullptr) noexcept std::nullptr_t> = nullptr) noexcept
: data_(s.data()), size_(s.size()) : data_(s.data()), size_(s.size())
{ {