summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-02-16 02:10:10 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-02-18 02:15:25 +0200
commitb5eff18f1aef980fa7eb55184996710a6fc9523e (patch)
tree65625ff6322213128f7311e278dd5d48d63a83b7 /include
parent68daa9302f90833ce345cb33ffcf075f23cbfc9a (diff)
libcamera: Use C++14 std::*_t type traits
C++14 introduced useful type traits helpers named std::*_t as aliases to std::*<...>::type. Use them to simplify the code. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Diffstat (limited to 'include')
-rw-r--r--include/libcamera/bound_method.h6
-rw-r--r--include/libcamera/object.h2
-rw-r--r--include/libcamera/signal.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/include/libcamera/bound_method.h b/include/libcamera/bound_method.h
index 7ffd2e42..983bb5cb 100644
--- a/include/libcamera/bound_method.h
+++ b/include/libcamera/bound_method.h
@@ -38,7 +38,7 @@ public:
{
}
- std::tuple<typename std::remove_reference<Args>::type...> args_;
+ std::tuple<typename std::remove_reference_t<Args>...> args_;
R ret_;
};
@@ -51,7 +51,7 @@ public:
{
}
- std::tuple<typename std::remove_reference<Args>::type...> args_;
+ std::tuple<typename std::remove_reference_t<Args>...> args_;
};
class BoundMethodBase
@@ -63,7 +63,7 @@ public:
}
virtual ~BoundMethodBase() {}
- template<typename T, typename std::enable_if<!std::is_same<Object, T>::value>::type * = 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_; }
diff --git a/include/libcamera/object.h b/include/libcamera/object.h
index 4d16f3f2..9a3dd070 100644
--- a/include/libcamera/object.h
+++ b/include/libcamera/object.h
@@ -30,7 +30,7 @@ public:
void postMessage(std::unique_ptr<Message> msg);
template<typename T, typename R, typename... FuncArgs, typename... Args,
- typename std::enable_if<std::is_base_of<Object, T>::value>::type * = nullptr>
+ typename 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/signal.h b/include/libcamera/signal.h
index c13bb30f..ed30eb55 100644
--- a/include/libcamera/signal.h
+++ b/include/libcamera/signal.h
@@ -45,7 +45,7 @@ public:
}
#ifndef __DOXYGEN__
- template<typename T, typename R, typename std::enable_if<std::is_base_of<Object, T>::value>::type * = 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)
{
@@ -53,7 +53,7 @@ public:
SignalBase::connect(new BoundMethodMember<T, void, Args...>(obj, object, func, type));
}
- template<typename T, typename R, typename std::enable_if<!std::is_base_of<Object, T>::value>::type * = 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