X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FRoute.cti;h=db9612e3c5bfd9060e107e4612d9716973b4754a;hb=74febc7a9abc84c4939269b3443d15fc27f4e960;hp=d6ed64eb09800f4fff135d3fe70d0925bb522ab6;hpb=69b25a4904fa86324aedc7147502255ce4117885;p=senf.git

diff --git a/senf/PPI/Route.cti b/senf/PPI/Route.cti
index d6ed64e..db9612e 100644
--- a/senf/PPI/Route.cti
+++ b/senf/PPI/Route.cti
@@ -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 Route inline template implementation */
@@ -28,9 +33,9 @@
 // Custom includes
 
 #define prefix_ inline
-///////////////////////////////cti.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::Route<Source,Target>
 
 template <class Source, class Target>
@@ -39,10 +44,10 @@ prefix_ senf::ppi::Route<Source,Target>::Route(module::Module & module, Source &
     : Base(module,source,target)
 {}
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::ForwardingRoute
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // protected members
 
 template <class T>
@@ -69,7 +74,7 @@ prefix_ void senf::ppi::ForwardingRoute::notifyUnthrottle(T & ob)
     ob.notifyUnthrottle();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::detail::BaseRouteImplementation<Source,Target,Base>
 
 template <class Source, class Target, class Base>
@@ -86,7 +91,7 @@ prefix_ Target & senf::ppi::detail::BaseRouteImplementation<Source,Target,Base>:
     return *target_;
 }
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // protected members
 
 template <class Source, class Target, class Base>
@@ -95,7 +100,7 @@ BaseRouteImplementation(module::Module & module, Source & source, Target & targe
     : Base(module), source_(&source), target_(&target)
 {}
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // private members
 
 template <class Source, class Target, class Base>
@@ -146,10 +151,10 @@ isSame(EventDescriptor const & event, EventDescriptor const & other)
     return &event == &other;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::detail::ForwardingRouteImplementation<Source,Target>
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // protected members
 
 template <class Source, class Target>
@@ -158,8 +163,8 @@ senf::ppi::detail::ForwardingRouteImplementation<Source,Target>::
 ForwardingRouteImplementation(module::Module & module, Source & source, Target & target)
     : Base(module,source,target)
 {
-    registerRoute(source);
-    registerRoute(target);
+    Base::registerRoute(source);
+    Base::registerRoute(target);
 }
 
 template <class Source, class Target>
@@ -167,11 +172,11 @@ prefix_
 senf::ppi::detail::ForwardingRouteImplementation<Source,Target>::
 ~ForwardingRouteImplementation()
 {
-    unregisterRoute(this->source());
-    unregisterRoute(this->target());
+    Base::unregisterRoute(this->source());
+    Base::unregisterRoute(this->target());
 }
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // private members
 
 template <class Source, class Target>
@@ -220,10 +225,10 @@ throttled(T & ob, boost::mpl::bool_<false> const &)
     return false;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::detail::RouteImplementation2<Source,Target>
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // protected members
 
 template <class Source, class Target>
@@ -232,10 +237,10 @@ RouteImplementation2(module::Module & module, Source & source, Target & target)
     : Base(module,source,target)
 {}
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::detail::RouteImplementation<Source,Target>
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // protected members
 
 template <class Source, class Target>
@@ -244,7 +249,7 @@ RouteImplementation(module::Module & module, Source & source, Target & target)
     : Base(module,source,target)
 {}
 
-///////////////////////////////cti.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_