fixes for g++ 4.5 (some members returned "the constructor, not the type")

[senf.git] / senf / PPI / Jack.cci

diff --git a/senf/PPI/Jack.cci b/senf/PPI/Jack.cci
index f40a3e9..8ebb7d2 100644 (file)
--- a/senf/PPI/Jack.cci
+++ b/senf/PPI/Jack.cci
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2009 
+// Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
@@ -29,7 +29,7 @@
 #include "Setup.hh"
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ senf::ppi::connector::GenericActiveInputJack::
 GenericActiveInputJack(GenericActiveInput & input)
@@ -42,16 +42,6 @@ senf::ppi::connector::GenericActiveInputJack::connector()
     return *input_;
 }
 
-prefix_ void senf::ppi::connector::GenericActiveInputJack::reset(GenericActiveInput & input)
-{
-    if (input_->connected()) {
-        GenericPassiveOutput & peer (input_->peer());
-        input_->disconnect();
-        connect(peer, input);
-    }
-    input_ = & input;
-}
-
 prefix_ senf::ppi::connector::GenericActiveOutputJack::
 GenericActiveOutputJack(GenericActiveOutput & output)
     : output_ (&output)
@@ -63,16 +53,6 @@ senf::ppi::connector::GenericActiveOutputJack::connector()
     return *output_;
 }
 
-prefix_ void senf::ppi::connector::GenericActiveOutputJack::reset(GenericActiveOutput & output)
-{
-    if (output_->connected()) {
-        GenericPassiveInput & peer (output_->peer());
-        output_->disconnect();
-        connect(output, peer);
-    }
-    output_ = & output;
-}
-
 prefix_ senf::ppi::connector::GenericPassiveInputJack::
 GenericPassiveInputJack(GenericPassiveInput & input)
     : input_ (&input)
@@ -84,16 +64,6 @@ senf::ppi::connector::GenericPassiveInputJack::connector()
     return *input_;
 }
 
-prefix_ void senf::ppi::connector::GenericPassiveInputJack::reset(GenericPassiveInput & input)
-{
-    if (input_->connected()) {
-        GenericActiveOutput & peer (input_->peer());
-        input_->disconnect();
-        connect(peer, input);
-    }
-    input_ = & input;
-}
-
 prefix_ senf::ppi::connector::GenericPassiveOutputJack::
 GenericPassiveOutputJack(GenericPassiveOutput & output)
     : output_ (&output)
@@ -105,25 +75,14 @@ senf::ppi::connector::GenericPassiveOutputJack::connector()
     return *output_;
 }
 
-prefix_ void
-senf::ppi::connector::GenericPassiveOutputJack::reset(GenericPassiveOutput & output)
-{
-    if (output_->connected()) {
-        GenericActiveInput & peer (output_->peer());
-        output_->disconnect();
-        connect(output, peer);
-    }
-    output_ = & output;
-}
-
 prefix_ senf::ppi::connector::ActiveInputJack<senf::Packet>::
 ActiveInputJack(GenericActiveInput & input)
-    : GenericActiveInputJack (input) 
+    : GenericActiveInputJack (input)
 {}
 
 prefix_ senf::ppi::connector::ActiveInputJack<senf::Packet>::
 ActiveInputJack(GenericActiveInputJack input)
-    : GenericActiveInputJack (input.connector()) 
+    : GenericActiveInputJack (input.connector())
 {}
 
 prefix_ void senf::ppi::connector::ActiveInputJack<senf::Packet>::reset(GenericActiveInput & input)
@@ -138,12 +97,12 @@ prefix_ void senf::ppi::connector::ActiveInputJack<senf::Packet>::reset(GenericA
 
 prefix_ senf::ppi::connector::ActiveOutputJack<senf::Packet>::
 ActiveOutputJack(GenericActiveOutput & output)
-    : GenericActiveOutputJack (output) 
+    : GenericActiveOutputJack (output)
 {}
 
 prefix_ senf::ppi::connector::ActiveOutputJack<senf::Packet>::
 ActiveOutputJack(GenericActiveOutputJack & output)
-    : GenericActiveOutputJack (output.connector()) 
+    : GenericActiveOutputJack (output.connector())
 {}
 
 prefix_ void senf::ppi::connector::ActiveOutputJack<senf::Packet>::reset(GenericActiveOutput & output)
@@ -159,12 +118,12 @@ senf::ppi::connector::ActiveOutputJack<senf::Packet>::reset(GenericActiveOutputJ
 
 prefix_ senf::ppi::connector::PassiveInputJack<senf::Packet>::
 PassiveInputJack(GenericPassiveInput & input)
-    : GenericPassiveInputJack (input) 
+    : GenericPassiveInputJack (input)
 {}
 
 prefix_ senf::ppi::connector::PassiveInputJack<senf::Packet>::
 PassiveInputJack(GenericPassiveInputJack & input)
-    : GenericPassiveInputJack (input.connector()) 
+    : GenericPassiveInputJack (input.connector())
 {}
 
 prefix_ void senf::ppi::connector::PassiveInputJack<senf::Packet>::reset(GenericPassiveInput & input)
@@ -180,12 +139,12 @@ senf::ppi::connector::PassiveInputJack<senf::Packet>::reset(GenericPassiveInputJ
 
 prefix_ senf::ppi::connector::PassiveOutputJack<senf::Packet>::
 PassiveOutputJack(GenericPassiveOutput & output)
-    : GenericPassiveOutputJack (output) 
+    : GenericPassiveOutputJack (output)
 {}
 
 prefix_ senf::ppi::connector::PassiveOutputJack<senf::Packet>::
 PassiveOutputJack(GenericPassiveOutputJack & output)
-    : GenericPassiveOutputJack (output.connector()) 
+    : GenericPassiveOutputJack (output.connector())
 {}
 
 prefix_ void
@@ -236,7 +195,7 @@ prefix_ void senf::ppi::connect(connector::GenericPassiveOutput & source,
     connect(source, target.connector());
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f