summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-01-04 00:23:42 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-01-07 22:29:27 +0200
commitd0cca54d4ae578801da7e261d3d9687bd0dd5cce (patch)
treeb1ca481c995fd3da05f3b85c1eb4e551ab7de1af
parent9fe225a79fe1f3a3b63c7064bba5e1920974effd (diff)
libcamera: bound_method: Move sequence and generator to BoundMethodBase
The sequence and generator member types of BoundMethodArgs are not dependent on the template arguments of BoundMethodArgs. To prepare for template specialization of BoundMethodArgs and avoid code duplication, move them to the BoundMethodBase class. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
-rw-r--r--include/libcamera/bound_method.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/include/libcamera/bound_method.h b/include/libcamera/bound_method.h
index a1541212..9fd58c69 100644
--- a/include/libcamera/bound_method.h
+++ b/include/libcamera/bound_method.h
@@ -39,19 +39,6 @@ public:
virtual void invokePack(void *pack) = 0;
protected:
- void activatePack(void *pack, bool deleteMethod);
-
- void *obj_;
- Object *object_;
-
-private:
- ConnectionType connectionType_;
-};
-
-template<typename... Args>
-class BoundMethodArgs : public BoundMethodBase
-{
-private:
#ifndef __DOXYGEN__
/*
* This is a cheap partial implementation of std::integer_sequence<>
@@ -71,10 +58,23 @@ private:
};
#endif
+ void activatePack(void *pack, bool deleteMethod);
+
+ void *obj_;
+ Object *object_;
+
+private:
+ ConnectionType connectionType_;
+};
+
+template<typename... Args>
+class BoundMethodArgs : public BoundMethodBase
+{
+private:
using PackType = std::tuple<typename std::remove_reference<Args>::type...>;
template<int... S>
- void invokePack(void *pack, sequence<S...>)
+ void invokePack(void *pack, BoundMethodBase::sequence<S...>)
{
PackType *args = static_cast<PackType *>(pack);
invoke(std::get<S>(*args)...);
@@ -87,7 +87,7 @@ public:
void invokePack(void *pack) override
{
- invokePack(pack, typename generator<sizeof...(Args)>::type());
+ invokePack(pack, typename BoundMethodBase::generator<sizeof...(Args)>::type());
}
virtual void activate(Args... args, bool deleteMethod = false) = 0;