[ViewVC] Diff of: cvs/gvpe/src/iom.h

Comparing gvpe/src/iom.h (file contents):
Revision 1.5 by pcg, Wed Mar 26 01:58:46 2003 UTC vs.
Revision 1.6 by pcg, Fri Mar 28 04:05:10 2003 UTC

   vector<const io_watcher *> iow;
   vector<time_watcher *> tw; // actually a heap
   void idle_cb (tstamp &ts); time_watcher *idle;
 public:
+  void reschedule_time_watchers ();
   // register a watcher
   void reg (int fd, short events, io_watcher *w);
   void unreg (const io_watcher *w);
   void reg (time_watcher *w);
   template<class O1, class O2>
   io_watcher (O1 *object, void (O2::*method)(short revents))
     : callback<void, short>(object,method)
     { }
+  ~io_watcher ()
+    {
+      iom.unreg (this);
+    }
   void start (int fd, short events)
     {
       iom.reg (fd, events, this);
     }
 };
 #define TSTAMP_CANCEL -1.
 struct time_watcher : callback<void, tstamp &> {
+  bool registered; // already registered?
   tstamp at;
   template<class O1, class O2>
   time_watcher (O1 *object, void (O2::*method)(tstamp &))
     : callback<void, tstamp &>(object,method)
+    , registered(false)
     { }
+  ~time_watcher ()
+    {
+      iom.unreg (this);
+    }
   void set (tstamp when);
   void trigger ();
   void operator ()()

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines