diff options
| author | Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com> | 2021-01-26 14:04:15 +0100 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2021-01-31 17:52:17 +0200 |
| commit | c763ae023d9b64e7910c2dfc849f6c1f5081f657 (patch) | |
| tree | 0d97f16f993b6a1b1740a684768ab3586998f457 /include/libcamera/controls.h | |
| parent | 33bfe7b7ef68d6221ad340ad117815e30f8fe6aa (diff) | |
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 6cbdc2859963e17bc897a4022f1d68170477d888.
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>
Diffstat (limited to 'include/libcamera/controls.h')
| -rw-r--r-- | include/libcamera/controls.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index dc549a92..3b7f3347 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -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> |