Packets/80221Bundle: integrated GenericTLVRegistry

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

diff --git a/senf/PPI/MultiConnectorMixin.hh b/senf/PPI/MultiConnectorMixin.hh
index 4e248ee..1619eca 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"
@@ -62,7 +61,7 @@ namespace ppi {
      */
     template <class MultiConnectorSource, class Target, class A1>
     MultiConnectorSource::ConnectorType & connect(
-        MultiConnectorSource & source, Target & target, A1 const & a1);
+        MultiConnectorSource & source, A1 const & a1, Target & target);
     
     /** \brief Connect arbitrary source to MultiConnector target
 
@@ -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 {
@@ -275,13 +267,6 @@ namespace module {
             1 ))
 #       include BOOST_PP_ITERATE()
 
-#       define BOOST_PP_ITERATION_PARAMS_1 (4, ( \
-            0, \
-            SENF_MULTI_CONNECTOR_MAX_ARGS2, \
-            SENF_ABSOLUTE_INCLUDE_PATH(PPI/MultiConnectorMixin.mpp), \
-            9 ))
-#       include BOOST_PP_ITERATE()
-
 #endif
 
         friend class detail::MultiConnectorMixinAccess;
@@ -337,7 +322,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 +373,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()