From 257bea076c5261059fc318cad101f2315634607b Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Fri, 3 Jan 2020 23:33:11 +0200
Subject: libcamera: bound_method: Store method arguments in a class
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Create a new BoundMethodPack class to replace the PackType type alias.
This will allow adding additional fields to the arguments pack, when
adding support for propagation of bound method return values.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
 Documentation/Doxyfile.in        |  1 +
 include/libcamera/bound_method.h | 21 +++++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Documentation/Doxyfile.in b/Documentation/Doxyfile.in
index 840c1b4c..9e5efae3 100644
--- a/Documentation/Doxyfile.in
+++ b/Documentation/Doxyfile.in
@@ -873,6 +873,7 @@ EXCLUDE_PATTERNS       =
 EXCLUDE_SYMBOLS        = libcamera::BoundMemberMethod \
                          libcamera::BoundMethodArgs \
                          libcamera::BoundMethodBase \
+                         libcamera::BoundMethodPack \
                          libcamera::BoundStaticMethod \
                          libcamera::SignalBase \
                          std::*
diff --git a/include/libcamera/bound_method.h b/include/libcamera/bound_method.h
index 9fd58c69..d194cd41 100644
--- a/include/libcamera/bound_method.h
+++ b/include/libcamera/bound_method.h
@@ -67,17 +67,30 @@ private:
 	ConnectionType connectionType_;
 };
 
+template<typename... Args>
+class BoundMethodPack
+{
+public:
+	BoundMethodPack(const Args &... args)
+		: args_(args...)
+	{
+	}
+
+	std::tuple<typename std::remove_reference<Args>::type...> args_;
+};
+
 template<typename... Args>
 class BoundMethodArgs : public BoundMethodBase
 {
-private:
-	using PackType = std::tuple<typename std::remove_reference<Args>::type...>;
+public:
+	using PackType = BoundMethodPack<Args...>;
 
+private:
 	template<int... S>
 	void invokePack(void *pack, BoundMethodBase::sequence<S...>)
 	{
 		PackType *args = static_cast<PackType *>(pack);
-		invoke(std::get<S>(*args)...);
+		invoke(std::get<S>(args->args_)...);
 		delete args;
 	}
 
@@ -98,7 +111,7 @@ template<typename T, typename... Args>
 class BoundMemberMethod : public BoundMethodArgs<Args...>
 {
 public:
-	using PackType = std::tuple<typename std::remove_reference<Args>::type...>;
+	using PackType = typename BoundMethodArgs<Args...>::PackType;
 
 	BoundMemberMethod(T *obj, Object *object, void (T::*func)(Args...),
 			  ConnectionType type = ConnectionTypeAuto)
-- 
cgit v1.2.1