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

Revert "libcamera: span: Provide and use helper variable templates 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 8e42c2feb7.

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:14 +01:00 • committed by Laurent Pinchart
parent 3809fd7746
commit 33bfe7b7ef
2 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/libcamera/controls.h
View file

@ -96,7 +96,7 @@ public:
ControlValue();
#ifndef __DOXYGEN__
template<typename T, typename std::enable_if_t<!details::is_span_v<T> &&
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::nullptr_t> = nullptr>
@ -107,7 +107,7 @@ public:
&value, 1, sizeof(T));
}
template<typename T, typename std::enable_if_t<details::is_span_v<T> ||
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::nullptr_t> = nullptr>
#else
@ -141,7 +141,7 @@ public:
}
#ifndef __DOXYGEN__
template<typename T, typename std::enable_if_t<!details::is_span_v<T> &&
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::nullptr_t> = nullptr>
T get() const
@ -152,7 +152,7 @@ public:
return *reinterpret_cast<const T *>(data().data());
}
template<typename T, typename std::enable_if_t<details::is_span_v<T> ||
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::nullptr_t> = nullptr>
#else
@ -169,7 +169,7 @@ public:
}
#ifndef __DOXYGEN__
template<typename T, typename std::enable_if_t<!details::is_span_v<T> &&
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::nullptr_t> = nullptr>
void set(const T &value)
@ -178,7 +178,7 @@ public:
reinterpret_cast<const void *>(&value), 1, sizeof(T));
}
template<typename T, typename std::enable_if_t<details::is_span_v<T> ||
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::nullptr_t> = nullptr>
#else