diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2022-07-28 13:34:55 +0300 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2022-07-28 18:47:17 +0300 |
commit | 1715b7ed089a8c3009ca39e0bd3081da217c61bc (patch) | |
tree | 1fb53fbb8161966d4110d9e03939ea35c43c446e | |
parent | c19150ea94ac095de63fe878282caf3b23dd461f (diff) |
libcamera: Drop unnecessary typename keyword used with std::enable_if_t
Usage of the std::enable_if_t type doesn't need to be prefixed by
typename. Drop the unnecessary keyword.
Reported-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
-rw-r--r-- | include/libcamera/base/bound_method.h | 2 | ||||
-rw-r--r-- | include/libcamera/base/flags.h | 8 | ||||
-rw-r--r-- | include/libcamera/base/object.h | 2 | ||||
-rw-r--r-- | include/libcamera/base/signal.h | 8 | ||||
-rw-r--r-- | include/libcamera/controls.h | 38 | ||||
-rw-r--r-- | include/libcamera/internal/ipa_data_serializer.h | 2 | ||||
-rw-r--r-- | include/libcamera/internal/yaml_parser.h | 4 | ||||
-rw-r--r-- | src/libcamera/yaml_parser.cpp | 2 |
8 files changed, 33 insertions, 33 deletions
diff --git a/include/libcamera/base/bound_method.h b/include/libcamera/base/bound_method.h index e73a4d98..c0275249 100644 --- a/include/libcamera/base/bound_method.h +++ b/include/libcamera/base/bound_method.h @@ -72,7 +72,7 @@ public: } virtual ~BoundMethodBase() = default; - template<typename T, typename std::enable_if_t<!std::is_same<Object, T>::value> * = nullptr> + template<typename T, 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_; } diff --git a/include/libcamera/base/flags.h b/include/libcamera/base/flags.h index bff3b93c..a1b404bd 100644 --- a/include/libcamera/base/flags.h +++ b/include/libcamera/base/flags.h @@ -147,7 +147,7 @@ struct flags_enable_operators { }; template<typename E> -typename std::enable_if_t<flags_enable_operators<E>::enable, Flags<E>> +std::enable_if_t<flags_enable_operators<E>::enable, Flags<E>> operator|(E lhs, E rhs) { using type = std::underlying_type_t<E>; @@ -155,7 +155,7 @@ operator|(E lhs, E rhs) } template<typename E> -typename std::enable_if_t<flags_enable_operators<E>::enable, Flags<E>> +std::enable_if_t<flags_enable_operators<E>::enable, Flags<E>> operator&(E lhs, E rhs) { using type = std::underlying_type_t<E>; @@ -163,7 +163,7 @@ operator&(E lhs, E rhs) } template<typename E> -typename std::enable_if_t<flags_enable_operators<E>::enable, Flags<E>> +std::enable_if_t<flags_enable_operators<E>::enable, Flags<E>> operator^(E lhs, E rhs) { using type = std::underlying_type_t<E>; @@ -171,7 +171,7 @@ operator^(E lhs, E rhs) } template<typename E> -typename std::enable_if_t<flags_enable_operators<E>::enable, Flags<E>> +std::enable_if_t<flags_enable_operators<E>::enable, Flags<E>> operator~(E rhs) { using type = std::underlying_type_t<E>; diff --git a/include/libcamera/base/object.h b/include/libcamera/base/object.h index eef1a2c9..93333636 100644 --- a/include/libcamera/base/object.h +++ b/include/libcamera/base/object.h @@ -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<Object, T>::value> * = nullptr> + std::enable_if_t<std::is_base_of<Object, T>::value> * = nullptr> R invokeMethod(R (T::*func)(FuncArgs...), ConnectionType type, Args&&... args) { diff --git a/include/libcamera/base/signal.h b/include/libcamera/base/signal.h index 91000d0d..efb591bc 100644 --- a/include/libcamera/base/signal.h +++ b/include/libcamera/base/signal.h @@ -44,7 +44,7 @@ public: } #ifndef __DOXYGEN__ - template<typename T, typename R, typename std::enable_if_t<std::is_base_of<Object, T>::value> * = nullptr> + template<typename T, typename R, 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, R, Args...>(obj, object, func, type)); } - template<typename T, typename R, typename std::enable_if_t<!std::is_base_of<Object, T>::value> * = nullptr> + template<typename T, typename R, std::enable_if_t<!std::is_base_of<Object, T>::value> * = nullptr> #else template<typename T, typename R> #endif @@ -63,7 +63,7 @@ public: #ifndef __DOXYGEN__ template<typename T, typename Func, - typename std::enable_if_t<std::is_base_of<Object, T>::value> * = nullptr> + std::enable_if_t<std::is_base_of<Object, T>::value> * = nullptr> void connect(T *obj, Func func, ConnectionType type = ConnectionTypeAuto) { Object *object = static_cast<Object *>(obj); @@ -71,7 +71,7 @@ public: } template<typename T, typename Func, - typename std::enable_if_t<!std::is_base_of<Object, T>::value> * = nullptr> + std::enable_if_t<!std::is_base_of<Object, T>::value> * = nullptr> #else template<typename T, typename Func> #endif diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index 7920abba..b1b52acb 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -99,10 +99,10 @@ public: ControlValue(); #ifndef __DOXYGEN__ - template<typename T, typename std::enable_if_t<!details::is_span<T>::value && - details::control_type<T>::value && - !std::is_same<std::string, std::remove_cv_t<T>>::value, - std::nullptr_t> = nullptr> + template<typename T, std::enable_if_t<!details::is_span<T>::value && + details::control_type<T>::value && + !std::is_same<std::string, std::remove_cv_t<T>>::value, + std::nullptr_t> = nullptr> ControlValue(const T &value) : type_(ControlTypeNone), numElements_(0) { @@ -110,9 +110,9 @@ public: &value, 1, sizeof(T)); } - template<typename T, typename std::enable_if_t<details::is_span<T>::value || - std::is_same<std::string, std::remove_cv_t<T>>::value, - std::nullptr_t> = nullptr> + template<typename T, std::enable_if_t<details::is_span<T>::value || + std::is_same<std::string, std::remove_cv_t<T>>::value, + std::nullptr_t> = nullptr> #else template<typename T> #endif @@ -144,9 +144,9 @@ public: } #ifndef __DOXYGEN__ - template<typename T, typename std::enable_if_t<!details::is_span<T>::value && - !std::is_same<std::string, std::remove_cv_t<T>>::value, - std::nullptr_t> = nullptr> + template<typename T, std::enable_if_t<!details::is_span<T>::value && + !std::is_same<std::string, std::remove_cv_t<T>>::value, + std::nullptr_t> = nullptr> T get() const { assert(type_ == details::control_type<std::remove_cv_t<T>>::value); @@ -155,9 +155,9 @@ public: return *reinterpret_cast<const T *>(data().data()); } - template<typename T, typename std::enable_if_t<details::is_span<T>::value || - std::is_same<std::string, std::remove_cv_t<T>>::value, - std::nullptr_t> = nullptr> + template<typename T, std::enable_if_t<details::is_span<T>::value || + std::is_same<std::string, std::remove_cv_t<T>>::value, + std::nullptr_t> = nullptr> #else template<typename T> #endif @@ -172,18 +172,18 @@ public: } #ifndef __DOXYGEN__ - template<typename T, typename std::enable_if_t<!details::is_span<T>::value && - !std::is_same<std::string, std::remove_cv_t<T>>::value, - std::nullptr_t> = nullptr> + template<typename T, std::enable_if_t<!details::is_span<T>::value && + !std::is_same<std::string, std::remove_cv_t<T>>::value, + std::nullptr_t> = nullptr> void set(const T &value) { set(details::control_type<std::remove_cv_t<T>>::value, false, reinterpret_cast<const void *>(&value), 1, sizeof(T)); } - template<typename T, typename std::enable_if_t<details::is_span<T>::value || - std::is_same<std::string, std::remove_cv_t<T>>::value, - std::nullptr_t> = nullptr> + template<typename T, std::enable_if_t<details::is_span<T>::value || + std::is_same<std::string, std::remove_cv_t<T>>::value, + std::nullptr_t> = nullptr> #else template<typename T> #endif diff --git a/include/libcamera/internal/ipa_data_serializer.h b/include/libcamera/internal/ipa_data_serializer.h index a87449c9..30bdaebc 100644 --- a/include/libcamera/internal/ipa_data_serializer.h +++ b/include/libcamera/internal/ipa_data_serializer.h @@ -32,7 +32,7 @@ LOG_DECLARE_CATEGORY(IPADataSerializer) namespace { template<typename T, - typename std::enable_if_t<std::is_arithmetic_v<T>> * = nullptr> + std::enable_if_t<std::is_arithmetic_v<T>> * = nullptr> void appendPOD(std::vector<uint8_t> &vec, T val) { constexpr size_t byteWidth = sizeof(val); diff --git a/include/libcamera/internal/yaml_parser.h b/include/libcamera/internal/yaml_parser.h index 78c359f7..5ba777d3 100644 --- a/include/libcamera/internal/yaml_parser.h +++ b/include/libcamera/internal/yaml_parser.h @@ -163,7 +163,7 @@ public: #ifndef __DOXYGEN__ template<typename T, - typename std::enable_if_t< + std::enable_if_t< std::is_same_v<bool, T> || std::is_same_v<double, T> || std::is_same_v<int16_t, T> || @@ -185,7 +185,7 @@ public: #ifndef __DOXYGEN__ template<typename T, - typename std::enable_if_t< + std::enable_if_t< std::is_same_v<bool, T> || std::is_same_v<double, T> || std::is_same_v<int16_t, T> || diff --git a/src/libcamera/yaml_parser.cpp b/src/libcamera/yaml_parser.cpp index 440e35c4..84cb57d6 100644 --- a/src/libcamera/yaml_parser.cpp +++ b/src/libcamera/yaml_parser.cpp @@ -307,7 +307,7 @@ std::optional<Size> YamlObject::get() const #ifndef __DOXYGEN__ template<typename T, - typename std::enable_if_t< + std::enable_if_t< std::is_same_v<bool, T> || std::is_same_v<double, T> || std::is_same_v<int16_t, T> || |