Packets: Fix VariantParser invalid parser access bug

[senf.git] / Scheduler / TimerEvent.hh

diff --git a/Scheduler/TimerEvent.hh b/Scheduler/TimerEvent.hh
index cbbb230..cb5e17f 100644 (file)
--- a/Scheduler/TimerEvent.hh
+++ b/Scheduler/TimerEvent.hh
@@ -23,8 +23,8 @@
 /** \file
     \brief TimerDispatcher public header */
 
-#ifndef HH_TimerDispatcher_
-#define HH_TimerDispatcher_ 1
+#ifndef HH_SENF_Scheduler_TimerEvent_
+#define HH_SENF_Scheduler_TimerEvent_ 1
 
 // Custom includes
 #include <signal.h>
@@ -66,7 +66,7 @@ namespace scheduler {
         callback is a member function it should be defined as a class member).
      */
     class TimerEvent
-        : public FIFORunner::TaskInfo,
+        : public detail::FIFORunner::TaskInfo,
           public detail::TimerSetBase
     {
     public:
@@ -106,7 +106,6 @@ namespace scheduler {
 
         void disable();                 ///< Disable timer
         void enable();                  ///< Enable timer
-        bool enabled();                 ///< \c true, if timer enabled, \c false otherwise        
 
         void action(Callback const & cb); ///< Change timer event callback
         void timeout(ClockService::clock_type timeout, bool initiallyEnabled=true);
@@ -116,7 +115,9 @@ namespace scheduler {
                                                  enable callback automatically. */
 
     private:
-        virtual void run();
+        virtual void v_run();
+        virtual char const * v_type() const;
+        virtual std::string v_info() const;
 
         Callback cb_;
         ClockService::clock_type timeout_;