X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FFdEvent.hh;h=24c49975c6d01d6ff715fe148668e158a827b904;hb=refs%2Fheads%2Fmaster;hp=bb10e110931714c7834e1dadf2e40adf8caf1eec;hpb=8f1ff66f5b7d10cfc6d35fb72267bc2fb3b588f7;p=senf.git

diff --git a/senf/Scheduler/FdEvent.hh b/senf/Scheduler/FdEvent.hh
index bb10e11..24c4997 100644
--- a/senf/Scheduler/FdEvent.hh
+++ b/senf/Scheduler/FdEvent.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 FdDispatcher public header */
@@ -33,7 +38,7 @@
 #include "FIFORunner.hh"
 
 //#include "FdEvent.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace scheduler {
@@ -42,7 +47,6 @@ namespace scheduler {
         struct FdSetTag;
         typedef boost::intrusive::iset_base_hook<FdSetTag> FdSetBase;
         struct FdSetCompare;
-        struct FindFd;
         class FdDispatcher;
         class FileDispatcher;
     }
@@ -85,7 +89,7 @@ namespace scheduler {
           public detail::FdManager::Event
     {
     public:
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         // Types
 
         typedef boost::function<void (int)> Callback;
@@ -102,9 +106,9 @@ namespace scheduler {
                       | detail::FdManager::EV_PRIO) ///< register all events (read, prio and write)
         };
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
-        ///@{
+        //\{
 
         template <class Handle>
         FdEvent(std::string const & name, Callback const & cb, Handle const & handle, int events,
@@ -133,8 +137,8 @@ namespace scheduler {
                                                  initialized. */
         ~FdEvent();
 
-        ///@}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-////////////////////////////////////////////////////////////////////////
 
         void disable();                 ///< Disable event
         void enable();                  ///< Enable event
@@ -166,8 +170,7 @@ namespace scheduler {
         int events_;
         int signaledEvents_;
 
-        friend class detail::FdSetCompare;
-        friend class detail::FindFd;
+        friend struct detail::FdSetCompare;
         friend class detail::FdDispatcher;
         friend class detail::FileDispatcher;
     };
@@ -182,7 +185,7 @@ namespace scheduler {
     int get_descriptor(Handle const & handle);
 }}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "FdEvent.cci"
 #include "FdEvent.ct"
 #include "FdEvent.cti"