minor fixes for clang++

[senf.git] / senf / PPI / Queueing.hh

diff --git a/senf/PPI/Queueing.hh b/senf/PPI/Queueing.hh
index 5ed6a9f..6df2e07 100644 (file)
--- a/senf/PPI/Queueing.hh
+++ b/senf/PPI/Queueing.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 Queueing public header */
@@ -30,7 +35,7 @@
 #include "predecl.hh"
 
 //#include "Queueing.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace ppi {
@@ -58,14 +63,15 @@ namespace ppi {
         virtual ~QueueingDiscipline();
 
         enum Event { ENQUEUE, DEQUEUE }; ///< Possible queueing events
-        
+        enum None_t { NONE };            ///< Type to disable the queueing discipline
+
         virtual void update(connector::GenericPassiveInput & input, Event event) = 0;
                                         ///< Calculate new queueing state
                                         /**< Whenever the queue is manipulated, this member is
                                              called to calculate the new throttling state. The
                                              member must call \a input's \c throttle() or \c
                                              unthrottle() member to set the new throttling state.
-                                             
+
                                              \param[in] input Connector holding the queue
                                              \param[in] event Type of event triggering the update */
     };
@@ -74,7 +80,7 @@ namespace ppi {
 
         The ThresholdQueueing QueueingDiscipline is a simple queueing discipline which throttles the
         input as soon the number of packets in the queue reaches the \a high threshold. The input
-        will be unthrottled when the number of packets drops to the \a low threshold. 
+        will be unthrottled when the number of packets drops to the \a low threshold.
 
         The default queueing discipline is ThresholdQueueing(1,0).
      */
@@ -93,7 +99,7 @@ namespace ppi {
 
 }}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "Queueing.cci"
 //#include "Queueing.ct"
 //#include "Queueing.cti"