X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FModule.hh;h=a2741ec9546accd65eac2c8c0ad05b0e1e16b9bd;hb=55b4c5a3afcf821031cef2ca7089fbdfd77d513a;hp=522db53067e55ce1572a0ef5ff6d6903c1ff51a0;hpb=9cb871b939efe93e35dd96808d25089399acfc46;p=senf.git

diff --git a/senf/PPI/Module.hh b/senf/PPI/Module.hh
index 522db53..a2741ec 100644
--- a/senf/PPI/Module.hh
+++ b/senf/PPI/Module.hh
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2007
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief Module public header
@@ -36,7 +41,7 @@
 #include "ModuleManager.hh"
 
 //#include "Module.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace ppi {
@@ -184,10 +189,7 @@ namespace module {
     protected:
         Module();
 
-#ifndef DOXYGEN
-        template <class Source, class Target>
-        Route<Source, Target> & route(Source & source, Target & target);
-#else
+#ifdef DOXYGEN
         Route<connector::InputConnector, connector::OutputConnector> &
         route(connector::InputConnector & input, connector::OutputConnector & output);
                                         ///< Define flow information
@@ -214,9 +216,7 @@ namespace module {
                                              \param[in] output Data target, object which controls
                                                  outgoing data (connector or event)
                                              \returns Route instance describing this route
-                                             \see \ref ppi_throttling
-                                             \note The real implementation is not provided by three
-                                                 overloads but by a single template member */
+                                             \see \ref ppi_throttling */
 
         Route<connector::InputConnector, EventDescriptor> &
         route(connector::InputConnector & input, EventDescriptor & output);
@@ -248,6 +248,21 @@ namespace module {
                                              enable/disable the event on throttling notifications.
 
                                              \see \ref route() */
+#else
+#       define route_decl(Source, Target)               \
+            Route<Source, Target> &                     \
+            route(Source & source, Target & target);
+
+        route_decl( connector::GenericPassiveInput, connector::GenericActiveOutput);
+        route_decl( connector::GenericPassiveInput, connector::GenericPassiveOutput);
+        route_decl( connector::GenericActiveInput,  connector::GenericPassiveOutput);
+        route_decl( connector::GenericActiveInput,  connector::GenericActiveOutput);
+        route_decl( connector::GenericPassiveInput, EventDescriptor);
+        route_decl( connector::GenericActiveInput,  EventDescriptor);
+        route_decl( EventDescriptor, connector::GenericPassiveOutput);
+        route_decl( EventDescriptor, connector::GenericActiveOutput);
+
+#undef Route_decl
 #endif
 
         void noroute(connector::Connector & connector); ///< Define terminal connectors
@@ -348,7 +363,7 @@ namespace module {
 
 }}}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "Module.cci"
 #include "Module.ct"
 //#include "Module.cti"