mirror of
https://git.libcamera.org/libcamera/libcamera.git
synced 2025-07-19 18:35:07 +03:00
Revert "libcamera: Use helper variable template 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 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
Laurent Pinchart
parent
33bfe7b7ef
commit
c763ae023d
5 changed files with 34 additions and 34 deletions
|
|
@ -63,7 +63,7 @@ public:
|
|||
}
|
||||
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(Object *object) { return object == object_; }
|
||||
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ public:
|
|||
#ifndef __DOXYGEN__
|
||||
template<typename T, typename std::enable_if_t<!details::is_span<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>
|
||||
ControlValue(const T &value)
|
||||
: type_(ControlTypeNone), numElements_(0)
|
||||
|
|
@ -108,7 +108,7 @@ public:
|
|||
}
|
||||
|
||||
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>
|
||||
#else
|
||||
template<typename T>
|
||||
|
|
@ -142,7 +142,7 @@ public:
|
|||
|
||||
#ifndef __DOXYGEN__
|
||||
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>
|
||||
T get() const
|
||||
{
|
||||
|
|
@ -153,7 +153,7 @@ public:
|
|||
}
|
||||
|
||||
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>
|
||||
#else
|
||||
template<typename T>
|
||||
|
|
@ -170,7 +170,7 @@ public:
|
|||
|
||||
#ifndef __DOXYGEN__
|
||||
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>
|
||||
void set(const T &value)
|
||||
{
|
||||
|
|
@ -179,7 +179,7 @@ public:
|
|||
}
|
||||
|
||||
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>
|
||||
#else
|
||||
template<typename T>
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ public:
|
|||
void postMessage(std::unique_ptr<Message> msg);
|
||||
|
||||
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,
|
||||
Args... args)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ public:
|
|||
}
|
||||
|
||||
#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...),
|
||||
ConnectionType type = ConnectionTypeAuto)
|
||||
{
|
||||
|
|
@ -52,7 +52,7 @@ public:
|
|||
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
|
||||
template<typename T, typename R>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -125,8 +125,8 @@ public:
|
|||
|
||||
template<std::size_t N>
|
||||
constexpr Span(element_type (&arr)[N],
|
||||
std::enable_if_t<std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],
|
||||
element_type (*)[]> &&
|
||||
std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],
|
||||
element_type (*)[]>::value &&
|
||||
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_v<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],
|
||||
element_type (*)[]> &&
|
||||
std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],
|
||||
element_type (*)[]>::value &&
|
||||
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_v<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],
|
||||
element_type (*)[]> &&
|
||||
std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],
|
||||
element_type (*)[]>::value &&
|
||||
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_v<Container> &&
|
||||
std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],
|
||||
element_type (*)[]>,
|
||||
!std::is_array<Container>::value &&
|
||||
std::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],
|
||||
element_type (*)[]>::value,
|
||||
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_v<Container> &&
|
||||
std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],
|
||||
element_type (*)[]>,
|
||||
!std::is_array<Container>::value &&
|
||||
std::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],
|
||||
element_type (*)[]>::value,
|
||||
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_v<U (*)[], element_type (*)[]> &&
|
||||
std::enable_if_t<std::is_convertible<U (*)[], element_type (*)[]>::value &&
|
||||
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_v<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],
|
||||
element_type (*)[]>,
|
||||
std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],
|
||||
element_type (*)[]>::value,
|
||||
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_v<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],
|
||||
element_type (*)[]>,
|
||||
std::enable_if_t<std::is_convertible<std::remove_pointer_t<decltype(utils::data(arr))> (*)[],
|
||||
element_type (*)[]>::value,
|
||||
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_v<Container> &&
|
||||
std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],
|
||||
element_type (*)[]>,
|
||||
!std::is_array<Container>::value &&
|
||||
std::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],
|
||||
element_type (*)[]>::value,
|
||||
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_v<Container> &&
|
||||
std::is_convertible_v<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],
|
||||
element_type (*)[]>,
|
||||
!std::is_array<Container>::value &&
|
||||
std::is_convertible<std::remove_pointer_t<decltype(utils::data(cont))> (*)[],
|
||||
element_type (*)[]>::value,
|
||||
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_v<U (*)[], element_type (*)[]>,
|
||||
std::enable_if_t<std::is_convertible<U (*)[], element_type (*)[]>::value,
|
||||
std::nullptr_t> = nullptr) noexcept
|
||||
: data_(s.data()), size_(s.size())
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue