X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FSignalEvent.hh;h=f2d3b45d49add0814317a034b063eff26092d21f;hb=refs%2Fheads%2Fmaster;hp=d3ff3ab796bf74ebde33865f3a0aa88db752116d;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Scheduler/SignalEvent.hh b/senf/Scheduler/SignalEvent.hh
index d3ff3ab..f2d3b45 100644
--- a/senf/Scheduler/SignalEvent.hh
+++ b/senf/Scheduler/SignalEvent.hh
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// 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 SignalDispatcher public header */
@@ -30,10 +35,10 @@
 #include <signal.h>
 #include <boost/function.hpp>
 #include "FIFORunner.hh"
-#include <boost/intrusive/iset_hook.hpp>
+#include <senf/boost_intrusive/iset_hook.hpp>
 
 //#include "SignalEvent.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 
@@ -46,7 +51,7 @@ namespace scheduler {
         typedef boost::intrusive::iset_base_hook<SignalSetTag> SignalSetBase;
         struct SignalSetCompare;
         struct FindNumericSignal;
-        struct SignalDispatcher;
+        class SignalDispatcher;
     }
 
     /** \brief UNIX signal event
@@ -61,18 +66,18 @@ namespace scheduler {
      */
     class SignalEvent
         : public detail::FIFORunner::TaskInfo,
-          public detail::SignalSetBase 
+          public detail::SignalSetBase
     {
     public:
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         // Types
 
         typedef boost::function<void (siginfo_t const &)> Callback;
                                         ///< Callback type
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
-        ///@{
+        //\{
 
         SignalEvent(int signal, Callback const & cb, bool initiallyEnabled=true);
                                         ///< Register a signal event
@@ -86,8 +91,8 @@ namespace scheduler {
                                                  enable callback automatically. */
         ~SignalEvent();
 
-        ///@}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-////////////////////////////////////////////////////////////////////////
 
         void disable();                 ///< Enable signal event registration
         void enable();                  ///< Disable the signal event registration
@@ -98,20 +103,20 @@ namespace scheduler {
         virtual void v_run();
         virtual char const * v_type() const;
         virtual std::string v_info() const;
-        
+
         int signal_;
         Callback cb_;
         siginfo_t siginfo_;
 
-        friend class detail::SignalSetCompare;
-        friend class detail::FindNumericSignal;
+        friend struct detail::SignalSetCompare;
+        friend struct detail::FindNumericSignal;
         friend class detail::SignalDispatcher;
     };
 
 
 }}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "SignalEvent.cci"
 //#include "SignalEvent.ct"
 //#include "SignalEvent.cti"