summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2025-02-25 01:08:12 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2025-03-03 14:53:35 +0200
commit5e6872740d39033094823eedbca7bf110e3720da (patch)
tree9dc08474e75b83565177a749580ff70b58cfe70c
parentbb1d216113bc9080167469f08c0a8329073991d9 (diff)
libcamera: base: signal: Drop pre-C++17 supportHEADmaster
The libcamera public API requires C++17, drop support for older standards. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
-rw-r--r--include/libcamera/base/signal.h14
1 files changed, 4 insertions, 10 deletions
diff --git a/include/libcamera/base/signal.h b/include/libcamera/base/signal.h
index bbff1495..ed1d81ea 100644
--- a/include/libcamera/base/signal.h
+++ b/include/libcamera/base/signal.h
@@ -63,11 +63,8 @@ public:
#ifndef __DOXYGEN__
template<typename T, typename Func,
- std::enable_if_t<std::is_base_of<Object, T>::value
-#if __cplusplus >= 201703L
- && std::is_invocable_v<Func, Args...>
-#endif
- > * = nullptr>
+ std::enable_if_t<std::is_base_of<Object, T>::value &&
+ std::is_invocable_v<Func, Args...>> * = nullptr>
void connect(T *obj, Func func, ConnectionType type = ConnectionTypeAuto)
{
Object *object = static_cast<Object *>(obj);
@@ -75,11 +72,8 @@ public:
}
template<typename T, typename Func,
- std::enable_if_t<!std::is_base_of<Object, T>::value
-#if __cplusplus >= 201703L
- && std::is_invocable_v<Func, Args...>
-#endif
- > * = nullptr>
+ std::enable_if_t<!std::is_base_of<Object, T>::value &&
+ std::is_invocable_v<Func, Args...>> * = nullptr>
#else
template<typename T, typename Func>
#endif