PPI: Fix (generic) 'Packet' Jack constructors

PPI/Jack.cci

@@ -75,6 +75,46 @@ senf::ppi::connector::GenericPassiveOutputJack::connector()
     return output_;
 }
 
+prefix_ senf::ppi::connector::ActiveInputJack<senf::Packet>::
+ActiveInputJack(GenericActiveInput & input)
+    : GenericActiveInputJack (input) 
+{}
+
+prefix_ senf::ppi::connector::ActiveInputJack<senf::Packet>::
+ActiveInputJack(GenericActiveInputJack input)
+    : GenericActiveInputJack (input.connector()) 
+{}
+
+prefix_ senf::ppi::connector::ActiveOutputJack<senf::Packet>::
+ActiveOutputJack(GenericActiveOutput & output)
+    : GenericActiveOutputJack (output) 
+{}
+
+prefix_ senf::ppi::connector::ActiveOutputJack<senf::Packet>::
+ActiveOutputJack(GenericActiveOutputJack & output)
+    : GenericActiveOutputJack (output.connector()) 
+{}
+
+prefix_ senf::ppi::connector::PassiveInputJack<senf::Packet>::
+PassiveInputJack(GenericPassiveInput & input)
+    : GenericPassiveInputJack (input) 
+{}
+
+prefix_ senf::ppi::connector::PassiveInputJack<senf::Packet>::
+PassiveInputJack(GenericPassiveInputJack & input)
+    : GenericPassiveInputJack (input.connector()) 
+{}
+
+prefix_ senf::ppi::connector::PassiveOutputJack<senf::Packet>::
+PassiveOutputJack(GenericPassiveOutput & output)
+    : GenericPassiveOutputJack (output) 
+{}
+
+prefix_ senf::ppi::connector::PassiveOutputJack<senf::Packet>::
+PassiveOutputJack(GenericPassiveOutputJack & output)
+    : GenericPassiveOutputJack (output.connector()) 
+{}
+
 prefix_ void senf::ppi::connect(connector::GenericActiveOutputJack & source,
                                 connector::GenericPassiveInputJack & target)
 {

PPI/Jack.cti

@@ -55,16 +55,6 @@ senf::ppi::connector::ActiveInputJack<PacketType>::ActiveInputJack(ActiveInputJa
     : GenericActiveInputJack (input.connector())
 {}
 
-prefix_
-senf::ppi::connector::ActiveInputJack<senf::Packet>::ActiveInputJack(ActiveInput<> & input)
-    : GenericActiveInputJack (input) 
-{}
-
-prefix_
-senf::ppi::connector::ActiveInputJack<senf::Packet>::ActiveInputJack(ActiveInputJack & input)
-    : GenericActiveInputJack (input.connector()) 
-{}
-
 template <class PacketType>
 prefix_ senf::ppi::connector::ActiveOutputJack<PacketType>::
 ActiveOutputJack(ActiveOutput<PacketType> & output)
@@ -89,16 +79,6 @@ ActiveOutputJack(ActiveOutputJack<> & output)
     : GenericActiveOutputJack (output.connector())
 {}
 
-prefix_ senf::ppi::connector::ActiveOutputJack<senf::Packet>::
-ActiveOutputJack(ActiveOutput<> & output)
-    : GenericActiveOutputJack (output) 
-{}
-
-prefix_ senf::ppi::connector::ActiveOutputJack<senf::Packet>::
-ActiveOutputJack(ActiveOutputJack & output)
-    : GenericActiveOutputJack (output.connector()) 
-{}
-
 template <class PacketType>
 prefix_ senf::ppi::connector::PassiveInputJack<PacketType>::
 PassiveInputJack(PassiveInput<PacketType> & input)
@@ -123,16 +103,6 @@ PassiveInputJack(PassiveInputJack<> & input)
     : GenericPassiveInputJack (input.connector())
 {}
 
-prefix_
-senf::ppi::connector::PassiveInputJack<senf::Packet>::PassiveInputJack(PassiveInput<> & input)
-    : GenericPassiveInputJack (input) 
-{}
-
-prefix_ senf::ppi::connector::PassiveInputJack<senf::Packet>::
-PassiveInputJack(PassiveInputJack & input)
-    : GenericPassiveInputJack (input.connector()) 
-{}
-
 template <class PacketType>
 prefix_ senf::ppi::connector::PassiveOutputJack<PacketType>::
 PassiveOutputJack(PassiveOutput<PacketType> & output)
@@ -157,16 +127,6 @@ PassiveOutputJack(PassiveOutputJack<> & output)
     : GenericPassiveOutputJack (output.connector())
 {}
 
-prefix_ senf::ppi::connector::PassiveOutputJack<senf::Packet>::
-PassiveOutputJack(PassiveOutput<> & output)
-    : GenericPassiveOutputJack (output) 
-{}
-
-prefix_ senf::ppi::connector::PassiveOutputJack<senf::Packet>::
-PassiveOutputJack(PassiveOutputJack & output)
-    : GenericPassiveOutputJack (output.connector()) 
-{}
-
 template <class T>
 prefix_ void
 senf::ppi::connect(connector::GenericActiveOutputJack & source, T & target,

PPI/Jack.hh

@@ -121,8 +121,8 @@ namespace connector {
         : public GenericActiveInputJack
     {
     public:
-        explicit ActiveInputJack(ActiveInput<> & input);
-        explicit ActiveInputJack(ActiveInputJack & input);
+        explicit ActiveInputJack(GenericActiveInput & input);
+        explicit ActiveInputJack(GenericActiveInputJack input);
     };
 
 #endif
@@ -148,8 +148,8 @@ namespace connector {
         : public GenericActiveOutputJack
     {
     public:
-        explicit ActiveOutputJack(ActiveOutput<> & output);
-        explicit ActiveOutputJack(ActiveOutputJack & output);
+        explicit ActiveOutputJack(GenericActiveOutput & output);
+        explicit ActiveOutputJack(GenericActiveOutputJack & output);
     };
 
 #endif
@@ -175,8 +175,8 @@ namespace connector {
         : public GenericPassiveInputJack
     {
     public:
-        explicit PassiveInputJack(PassiveInput<> & input);
-        explicit PassiveInputJack(PassiveInputJack & input);
+        explicit PassiveInputJack(GenericPassiveInput & input);
+        explicit PassiveInputJack(GenericPassiveInputJack & input);
     };
 
 #endif
@@ -202,8 +202,8 @@ namespace connector {
         : public GenericPassiveOutputJack
     {
     public:
-        explicit PassiveOutputJack(PassiveOutput<> & output);
-        explicit PassiveOutputJack(PassiveOutputJack & output);
+        explicit PassiveOutputJack(GenericPassiveOutput & output);
+        explicit PassiveOutputJack(GenericPassiveOutputJack & output);
     };
 
 #endif