X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FSetup.hh;h=09e840f6d755a2a846f91f4292ddf36c3f882fb4;hb=8a6697d11e9a6557d9a5c42b4052666fce32bc10;hp=7b2c07abd92d0e797a49640aaa4cda080b93470a;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/PPI/Setup.hh b/senf/PPI/Setup.hh
index 7b2c07a..09e840f 100644
--- a/senf/PPI/Setup.hh
+++ b/senf/PPI/Setup.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 Setup public header */
@@ -32,12 +37,12 @@
 #include "predecl.hh"
 
 //#include "Setup.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace ppi {
 
-namespace detail { 
+namespace detail {
     struct DisableStandardInput {};
     struct DisableStandardOutput {};
     struct DisableStandardConnect : public DisableStandardInput, public DisableStandardOutput {};
@@ -65,7 +70,7 @@ namespace detail {
 
         \throws connector::IncompatibleConnectorsException if the two connectors are not type
             compatible.
-        
+
         \see \ref ppi_connections
      */
     void connect(connector::OutputConnector & source, connector::InputConnector & target, ...);
@@ -77,7 +82,7 @@ namespace detail {
 
 #endif
 
-#ifndef DOXYGEN    
+#ifndef DOXYGEN
 
     template <class T, class C>
     void connect(T & source, C & target,
@@ -99,7 +104,7 @@ namespace detail {
                  typename boost::disable_if< boost::is_base_of<detail::DisableStandardInput, T2> >:: type * = 0);
 
 #endif
-    
+
     /** \brief Start the network
 
         Calling senf::ppi::run() will start processing the network. The main event loop is managed
@@ -116,7 +121,7 @@ namespace detail {
     void run();
 
     /** \brief Manually initialize the network
-        
+
         For debugging purposes, it is sometimes simpler to not use senf::ppi::run() but instead
         drive the network via explicit calls using the debug modules. However, it is still necessary
         to initialize the network. This operation is performed by senf::ppi::init().
@@ -125,7 +130,7 @@ namespace detail {
 
 }}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "Setup.cci"
 //#include "Setup.ct"
 #include "Setup.cti"