X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FAnnotationRouter.hh;h=83a5a8abb9a2cd7d2a17e0f26396de48c0bb6813;hb=HEAD;hp=fa4fbc5f5afb827de6f3848beca284873edfc158;hpb=9cb871b939efe93e35dd96808d25089399acfc46;p=senf.git

diff --git a/senf/PPI/AnnotationRouter.hh b/senf/PPI/AnnotationRouter.hh
index fa4fbc5..83a5a8a 100644
--- a/senf/PPI/AnnotationRouter.hh
+++ b/senf/PPI/AnnotationRouter.hh
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2008
 // 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 AnnotationRouter public header */
@@ -34,7 +39,7 @@
 #include "MultiConnectorMixin.hh"
 
 //#include "AnnotationRouter.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace ppi {
@@ -51,7 +56,7 @@ namespace module {
         The \a AnnotationType template parameter defines the routing key. This annotation must
         support the following operations:
         \li Comparison with '<' (\c LessThanComparable concept)
-        \li Copy construction and copy assignment (\c Copyable und \c Assignable concepts)
+        \li Copy construction and copy assignment (\c Copyable and \c Assignable concepts)
             (e.g. via compiler synthesized copy constructor and assignment operator)
         \li Output streaming to an ostream via '\c <<' (for error description purposes) (\c
             OutputStreamable concept)
@@ -123,7 +128,7 @@ namespace module {
 
 }}}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 //#include "AnnotationRouter.cci"
 #include "AnnotationRouter.ct"
 //#include "AnnotationRouter.cti"