switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / PPI / QueueingSocketSink.cc

diff --git a/senf/PPI/QueueingSocketSink.cc b/senf/PPI/QueueingSocketSink.cc
index c21eeb8..5ece957 100644 (file)
--- a/senf/PPI/QueueingSocketSink.cc
+++ b/senf/PPI/QueueingSocketSink.cc
@@ -2,25 +2,30 @@
 //
 // Copyright (C) 2010
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Thorsten Horstmann <tho@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):
+//   Thorsten Horstmann <tho@berlios.de>
 
+//
 /** \file
     \brief QueueingSocketSink non-inline non-template implementation */
 
@@ -28,13 +33,14 @@
 //#include "QueueingSocketSink.ih"
 
 // Custom includes
+#include <senf/Utils/Console/Variables.hh>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 SENF_PPI_REGISTER_QALGORITHM( "FIFOQueueingAlgorithm", senf::ppi::FIFOQueueingAlgorithm);
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::QueueingAlgorithm
 
 prefix_ senf::ppi::QueueingAlgorithm::QueueingAlgorithm()
@@ -50,7 +56,7 @@ prefix_ senf::console::DirectoryNode & senf::ppi::QueueingAlgorithm::consoleDir(
     return dir_;
 }
 
-/////////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::QueueingAlgorithmRegistry
 
 prefix_ void senf::ppi::QueueingAlgorithmRegistry::dump(std::ostream & os)
@@ -71,7 +77,7 @@ prefix_ senf::ppi::QueueingAlgorithm::ptr senf::ppi::QueueingAlgorithmRegistry::
         throw Exception("QueueingAlgorithm not registered: ") << key;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::FIFOQueueingAlgorithm
 
 prefix_ senf::ppi::FIFOQueueingAlgorithm::FIFOQueueingAlgorithm()
@@ -83,7 +89,7 @@ prefix_ senf::ppi::FIFOQueueingAlgorithm::FIFOQueueingAlgorithm()
 prefix_ senf::Packet senf::ppi::FIFOQueueingAlgorithm::v_dequeue()
 {
     if (queue_.size() > 0) {
-        Packet const & p = queue_.front();
+        Packet p (queue_.front());
         queue_.pop();
         return p;
     }
@@ -109,5 +115,5 @@ prefix_ senf::ppi::QueueingAlgorithm::ptr senf::ppi::FIFOQueueingAlgorithm::crea
     return new FIFOQueueingAlgorithm();
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_