added scheduler watchdog members to sys/scheduler console dir

[senf.git] / senf / Scheduler / EventManager.hh

diff --git a/senf/Scheduler/EventManager.hh b/senf/Scheduler/EventManager.hh
index cd6cb87..a511b47 100644 (file)
--- a/senf/Scheduler/EventManager.hh
+++ b/senf/Scheduler/EventManager.hh
@@ -1,6 +1,6 @@
 // $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>
@@ -29,13 +29,12 @@
 // Custom includes
 #include <string>
 #include <boost/iterator/filter_iterator.hpp>
-#include <boost/intrusive/ilist.hpp>
-#include <boost/intrusive/ilist_hook.hpp>
-#include "../Utils/singleton.hh"
-#include "../Utils/Console/LazyDirectory.hh"
+#include <senf/boost_intrusive/ilist.hpp>
+#include <senf/boost_intrusive/ilist_hook.hpp>
+#include <senf/Utils/singleton.hh>
 
 //#include "EventManager.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace scheduler {
@@ -52,18 +51,18 @@ namespace detail {
         : public EventListBase
     {
     public:
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         // Types
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
-        ///@{
-        
+        //\{
+
         explicit Event(std::string const & name);
         virtual ~Event();
 
-        ///@}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-////////////////////////////////////////////////////////////////////////
 
         std::string const & name() const; ///< Get event name
         bool enabled() const;           ///< \c true, if event is enabled, \c false otherwise
@@ -91,7 +90,7 @@ namespace detail {
     public:
         using singleton<EventManager>::instance;
         using singleton<EventManager>::alive;
-        
+
         struct IteratorFilter {
             bool operator()(Event const & e);
         };
@@ -115,15 +114,11 @@ namespace detail {
         EventList events_;
 
         friend class singleton<EventManager>;
-
-#ifndef SENF_DISABLE_CONSOLE
-        console::LazyDirectory consoleDir_;
-#endif
     };
 
 }}}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "EventManager.cci"
 //#include "EventManager.ct"
 //#include "EventManager.cti"