PPI: Implement a more sane multi-connector connect API

[senf.git] / senf / PPI / MultiConnectorMixin.hh

diff --git a/senf/PPI/MultiConnectorMixin.hh b/senf/PPI/MultiConnectorMixin.hh
index 4e248ee..f0d3102 100644 (file)
--- a/senf/PPI/MultiConnectorMixin.hh
+++ b/senf/PPI/MultiConnectorMixin.hh
@@ -36,7 +36,6 @@
 
 #ifndef SENF_MULTI_CONNECTOR_MAX_ARGS
 #define SENF_MULTI_CONNECTOR_MAX_ARGS 3
-#define SENF_MULTI_CONNECTOR_MAX_ARGS2 6
 #endif
 
 #include "MultiConnectorMixin.mpp"
@@ -89,13 +88,6 @@ namespace ppi {
             2 ))
 #   include BOOST_PP_ITERATE()
 
-#   define BOOST_PP_ITERATION_PARAMS_1 (4, ( \
-            0, \
-            SENF_MULTI_CONNECTOR_MAX_ARGS2, \
-            SENF_ABSOLUTE_INCLUDE_PATH(PPI/MultiConnectorMixin.mpp), \
-            6 ))
-#   include BOOST_PP_ITERATE()
-
 #endif
 
 namespace module {
@@ -277,7 +269,7 @@ namespace module {
 
 #       define BOOST_PP_ITERATION_PARAMS_1 (4, ( \
             0, \
-            SENF_MULTI_CONNECTOR_MAX_ARGS2, \
+            2*SENF_MULTI_CONNECTOR_MAX_ARGS, \
             SENF_ABSOLUTE_INCLUDE_PATH(PPI/MultiConnectorMixin.mpp), \
             9 ))
 #       include BOOST_PP_ITERATE()
@@ -337,7 +329,7 @@ namespace module {
         
 #       define BOOST_PP_ITERATION_PARAMS_1 (4, ( \
             0, \
-            SENF_MULTI_CONNECTOR_MAX_ARGS2, \
+            2*SENF_MULTI_CONNECTOR_MAX_ARGS, \
             SENF_ABSOLUTE_INCLUDE_PATH(PPI/MultiConnectorMixin.mpp), \
             9 ))
 #       include BOOST_PP_ITERATE()
@@ -388,7 +380,7 @@ namespace module {
 
 #       define BOOST_PP_ITERATION_PARAMS_1 (4, ( \
             0, \
-            SENF_MULTI_CONNECTOR_MAX_ARGS2, \
+            2*SENF_MULTI_CONNECTOR_MAX_ARGS, \
             SENF_ABSOLUTE_INCLUDE_PATH(PPI/MultiConnectorMixin.mpp), \
             9 ))
 #       include BOOST_PP_ITERATE()